Merge changes from topic 'coverity_scan'

* changes:
  Fix a resource leak
  Fix possible data race condition