Fixes part of ticket #7146, dealing with leaks of packet data since
commit 87c88122.
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit b8629654)