coverity scan defects fixed
Merge pull request #2274 from mazumdarparijat/C45

coverity scan defects fixed