@matheusbsbs / matheus-bagliano / commits / 47fc52e287
Fork 0

create_symref(): do not assume pathname from git_path() persists long enough

Being lazy to rely on the cycling N buffers mkpath() and friends return is nice in general, but it makes it too easy to introduce new bugs that are "mysterious". Introduction of read_ref() in create_symref() after calling git_path() to get the git_HEAD value (i.e. the path to create a new symref at) consumed more than the available buffers and broke a later call to mkpath() that derives lockpath from it. Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Jan 26, 2007 at 17:49 UTC 47fc52e2876ed3a54cd4b77e0b0c4875fa3317b8
1 file changed +11 -9
refs.c
+11 -9
@@ -992,7 +992,7 @@ int create_symref(const char *ref_target, const char *refs_heads_master,
992 const char *lockpath;
993 char ref[1000];
994 int fd, len, written;
995 - const char *git_HEAD = git_path("%s", ref_target);
995 + char *git_HEAD = xstrdup(git_path("%s", ref_target));
996 unsigned char old_sha1[20], new_sha1[20];
997
998 if (logmsg && read_ref(ref_target, old_sha1))
@@ -1010,36 +1010,38 @@ int create_symref(const char *ref_target, const char *refs_heads_master,
1010 len = snprintf(ref, sizeof(ref), "ref: %s\n", refs_heads_master);
1011 if (sizeof(ref) <= len) {
1012 error("refname too long: %s", refs_heads_master);
1013 - return -1;
1013 + goto error_free_return;
1014 }
1015 lockpath = mkpath("%s.lock", git_HEAD);
1016 fd = open(lockpath, O_CREAT | O_EXCL | O_WRONLY, 0666);
1017 if (fd < 0) {
1018 error("Unable to open %s for writing", lockpath);
1019 - return -5;
1019 + goto error_free_return;
1020 }
1021 written = write_in_full(fd, ref, len);
1022 close(fd);
1023 if (written != len) {
1024 - unlink(lockpath);
1024 error("Unable to write to %s", lockpath);
1026 - return -2;
1025 + goto error_unlink_return;
1026 }
1027 if (rename(lockpath, git_HEAD) < 0) {
1029 - unlink(lockpath);
1028 error("Unable to create %s", git_HEAD);
1031 - return -3;
1029 + goto error_unlink_return;
1030 }
1031 if (adjust_shared_perm(git_HEAD)) {
1034 - unlink(lockpath);
1032 error("Unable to fix permissions on %s", lockpath);
1036 - return -4;
1033 + error_unlink_return:
1034 + unlink(lockpath);
1035 + error_free_return:
1036 + free(git_HEAD);
1037 + return -1;
1038 }
1039
1040 done:
1041 if (logmsg && !read_ref(refs_heads_master, new_sha1))
1042 log_ref_write(ref_target, old_sha1, new_sha1, logmsg);
1043
1044 + free(git_HEAD);
1045 return 0;
1046 }
1047