From bcfd61416ff789520cfa793d7f69c80a52bd0964 Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Fri, 12 Dec 2014 18:20:24 +0100 Subject: [PATCH] Fix a fix: defrag OOM condition ** CID 1257764: Dereference after null check (FORWARD_NULL) /src/defrag.c: 291 in Defrag4Reassemble() ** CID 1257763: Dereference after null check (FORWARD_NULL) /src/defrag.c: 409 in Defrag6Reassemble() In the error case 'rp' can be both NULL or non-NULL. --- src/defrag.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/defrag.c b/src/defrag.c index 71225b8da9..f005ade7de 100644 --- a/src/defrag.c +++ b/src/defrag.c @@ -358,7 +358,8 @@ done: error_remove_tracker: tracker->remove = 1; DefragTrackerFreeFrags(tracker); - PacketFreeOrRelease(rp); + if (rp != NULL) + PacketFreeOrRelease(rp); return NULL; } @@ -480,7 +481,8 @@ done: error_remove_tracker: tracker->remove = 1; DefragTrackerFreeFrags(tracker); - PacketFreeOrRelease(rp); + if (rp != NULL) + PacketFreeOrRelease(rp); return NULL; } -- 2.47.2