undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jm/maint-misc-fix' into maint

Browse Source 
* jm/maint-misc-fix:
  read_gitfile_gently: use ssize_t to hold read result
  remove tests of always-false condition
  rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'
This commit is contained in:
Junio C Hamano 2011-05-30 00:09:41 -07:00
commit 5b42477b59
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fsck.c
View File

@ -349,7 +349,7 @@ int fsck_error_function(struct object *obj, int type, const char *fmt, ...)
va_list ap; va_list ap;
struct strbuf sb = STRBUF_INIT; struct strbuf sb = STRBUF_INIT;
strbuf_addf(&sb, "object %s:", obj->sha1?sha1_to_hex(obj->sha1):"(null)"); strbuf_addf(&sb, "object %s:", sha1_to_hex(obj->sha1));
va_start(ap, fmt); va_start(ap, fmt);
strbuf_vaddf(&sb, fmt, ap); strbuf_vaddf(&sb, fmt, ap);

10
rerere.c
View File

@ -47,8 +47,14 @@ static void read_rr(struct string_list *rr)
name = xstrdup(buf); name = xstrdup(buf);
if (fgetc(in) != '\t') if (fgetc(in) != '\t')
die("corrupt MERGE_RR"); die("corrupt MERGE_RR");
for (i = 0; i < sizeof(buf) && (buf[i] = fgetc(in)); i++) for (i = 0; i < sizeof(buf); i++) {
; /* do nothing */ int c = fgetc(in);
if (c < 0)
die("corrupt MERGE_RR");
buf[i] = c;
if (c == 0)
break;
}
if (i == sizeof(buf)) if (i == sizeof(buf))
die("filename too long"); die("filename too long");
string_list_insert(rr, buf)->util = name; string_list_insert(rr, buf)->util = name;

2
setup.c
View File

@ -275,7 +275,7 @@ const char *read_gitfile_gently(const char *path)
const char *slash; const char *slash;
struct stat st; struct stat st;
int fd; int fd;
size_t len; ssize_t len;
if (stat(path, &st)) if (stat(path, &st))
return NULL; return NULL;

2
transport.c
View File

@ -156,7 +156,7 @@ static void set_upstreams(struct transport *transport, struct ref *refs,
continue; continue;
if (!ref->peer_ref) if (!ref->peer_ref)
continue; continue;
if (!ref->new_sha1 || is_null_sha1(ref->new_sha1)) if (is_null_sha1(ref->new_sha1))
continue; continue;
/* Follow symbolic refs (mainly for HEAD). */ /* Follow symbolic refs (mainly for HEAD). */