From 73870ef87918bf1fd027d6991eaee5366bc7b46c Mon Sep 17 00:00:00 2001 From: "Stephen M. Cameron" Date: Wed, 2 Oct 2019 19:40:54 -0400 Subject: [PATCH] Do not test for NULL before free() Signed-off-by: Stephen M. Cameron --- wiggle.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 -- 2.39.5