]> git.neil.brown.name Git - wiggle.git/commitdiff
Do not test for NULL before free()
authorStephen M. Cameron <stephenmcameron@gmail.com>
Wed, 2 Oct 2019 23:40:54 +0000 (19:40 -0400)
committerStephen M. Cameron <stephenmcameron@gmail.com>
Wed, 2 Oct 2019 23:40:54 +0000 (19:40 -0400)
Signed-off-by: Stephen M. Cameron <stephenmcameron@gmail.com>
wiggle.c

index e1728a3778af85f94bfe4d016cb28ddd043ae338..aed7ac9fc52f77ee1c4d9fa6f740cc2e0f197d1c 100644 (file)
--- 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