aboutsummaryrefslogtreecommitdiff
path: root/refs
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-10-17 13:25:20 -0700
committerJunio C Hamano <gitster@pobox.com>2016-10-17 13:25:20 -0700
commitf7300cbfdde611d4bf2b7185e9d00624526953ef (patch)
treeefbb3c1545d54ac3910f4880fdaafbf377ac766b /refs
parent25ab004c53cdcfea485e5bf437aeaa74df47196d (diff)
parente8c42cb9ce6a566aad797cc6c5bc1279d608d819 (diff)
downloadgit-f7300cbfdde611d4bf2b7185e9d00624526953ef.tar.gz
git-f7300cbfdde611d4bf2b7185e9d00624526953ef.tar.xz
Merge branch 'jk/ref-symlink-loop'
A stray symbolic link in $GIT_DIR/refs/ directory could make name resolution loop forever, which has been corrected. * jk/ref-symlink-loop: files_read_raw_ref: prevent infinite retry loops in general files_read_raw_ref: avoid infinite loop on broken symlinks
Diffstat (limited to 'refs')
-rw-r--r--refs/files-backend.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/refs/files-backend.c b/refs/files-backend.c
index d16feb19c..f9023939d 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -1353,6 +1353,7 @@ static int files_read_raw_ref(struct ref_store *ref_store,
int fd;
int ret = -1;
int save_errno;
+ int remaining_retries = 3;
*type = 0;
strbuf_reset(&sb_path);
@@ -1373,8 +1374,14 @@ stat_ref:
* <-> symlink) between the lstat() and reading, then
* we don't want to report that as an error but rather
* try again starting with the lstat().
+ *
+ * We'll keep a count of the retries, though, just to avoid
+ * any confusing situation sending us into an infinite loop.
*/
+ if (remaining_retries-- <= 0)
+ goto out;
+
if (lstat(path, &st) < 0) {
if (errno != ENOENT)
goto out;
@@ -1403,6 +1410,11 @@ stat_ref:
ret = 0;
goto out;
}
+ /*
+ * It doesn't look like a refname; fall through to just
+ * treating it like a non-symlink, and reading whatever it
+ * points to.
+ */
}
/* Is it a directory? */
@@ -1426,7 +1438,7 @@ stat_ref:
*/
fd = open(path, O_RDONLY);
if (fd < 0) {
- if (errno == ENOENT)
+ if (errno == ENOENT && !S_ISLNK(st.st_mode))
/* inconsistent with lstat; retry */
goto stat_ref;
else