Fix "ptential heap pollution" Eclipse warnings

Change-Id: Id7cdb9349705d374fc0682e0d9aa84b51017754f
Signed-off-by: Lorand Jakab <lojakab@cisco.com>