xdl_merge(): fix a segmentation fault when refining conflicts

[git.git] / config.c

diff --git a/config.c b/config.c
index 6a4224e98cf51f8ced2b8e942231012b42aaeef7..1662a4626e569b07d96c622b357928216a24538c 100644 (file)
--- a/config.c
+++ b/config.c
@@ -6,7 +6,6 @@
  *
  */
 #include "cache.h"
-#include <regex.h>
 
 #define MAXNAME (256)
 
@@ -749,7 +748,7 @@ out_free:
 int git_config_rename_section(const char *old_name, const char *new_name)
 {
        int ret = 0;
-       const char *config_filename;
+       char *config_filename;
        struct lock_file *lock = xcalloc(sizeof(struct lock_file), 1);
        int out_fd;
        char buf[1024];
@@ -762,11 +761,15 @@ int git_config_rename_section(const char *old_name, const char *new_name)
        }
        config_filename = xstrdup(config_filename);
        out_fd = hold_lock_file_for_update(lock, config_filename, 0);
-       if (out_fd < 0)
-               return error("Could not lock config file!");
+       if (out_fd < 0) {
+               ret = error("Could not lock config file!");
+               goto out;
+       }
 
-       if (!(config_file = fopen(config_filename, "rb")))
-               return error("Could not open config file!");
+       if (!(config_file = fopen(config_filename, "rb"))) {
+               ret = error("Could not open config file!");
+               goto out;
+       }
 
        while (fgets(buf, sizeof(buf), config_file)) {
                int i;
@@ -806,8 +809,11 @@ int git_config_rename_section(const char *old_name, const char *new_name)
                }
                write(out_fd, buf, strlen(buf));
        }
+       fclose(config_file);
        if (close(out_fd) || commit_lock_file(lock) < 0)
-               return error("Cannot commit config file!");
+               ret = error("Cannot commit config file!");
+ out:
+       free(config_filename);
        return ret;
 }