am db2e477e: Fix two valgrind errors (bug 2208968)

Merge commit 'db2e477e3e40a5863ed243543ae7e2c4b6dc3108' into eclair-mr2

* commit 'db2e477e3e40a5863ed243543ae7e2c4b6dc3108':
  Fix two valgrind errors (bug 2208968)