From: Stephen M. Cameron <stephenmcameron@gmail.com>
Date: Wed, 2 Oct 2019 23:40:54 +0000 (-0400)
Subject: Do not test for NULL before free()
X-Git-Tag: v1.2~1^2^2
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=73870ef87918bf1fd027d6991eaee5366bc7b46c;p=wiggle.git

Do not test for NULL before free()

Signed-off-by: Stephen M. Cameron <stephenmcameron@gmail.com>
---

diff --git a/wiggle.c b/wiggle.c
index e1728a3..aed7ac9 100644
--- a/wiggle.c
+++ b/wiggle.c
@@ -624,10 +624,8 @@ static int do_merge(int argc, char *argv[], int obj, int blanks,
 			return 2;
 		}
 	}
-	if (replacename)
-		free(replacename);
-	if (orignew)
-		free(orignew);
+	free(replacename);
+	free(orignew);
 	if (show_wiggles)
 		return ci.conflicts + ci.wiggles > 0;
 	else