xdl_merge(): fix a segmentation fault when refining conflicts

[git.git] / interpolate.c

diff --git a/interpolate.c b/interpolate.c
index 62701d8435e6c113bf683c72a038874ed1acc2de..f992ef77533737fe2ec52dc3b662cb6cacca0ea2 100644 (file)
--- a/interpolate.c
+++ b/interpolate.c
@@ -2,16 +2,14 @@
  * Copyright 2006 Jon Loeliger
  */
 
-#include <string.h>
-
 #include "git-compat-util.h"
 #include "interpolate.h"
 
 
-void interp_set_entry(struct interp *table, int slot, char *value)
+void interp_set_entry(struct interp *table, int slot, const char *value)
 {
        char *oldval = table[slot].value;
-       char *newval = value;
+       char *newval = NULL;
 
        if (oldval)
                free(oldval);