提交 872c930d 编写于 作者: J Jim Meyering 提交者: Junio C Hamano

Don't access line[-1] for a zero-length "line" from fgets.

A NUL byte at beginning of file, or just after a newline
would provoke an invalid buf[-1] access in a few places.

* builtin-grep.c (cmd_grep): Don't access buf[-1].
* builtin-pack-objects.c (get_object_list): Likewise.
* builtin-rev-list.c (read_revisions_from_stdin): Likewise.
* bundle.c (read_bundle_header): Likewise.
* server-info.c (read_pack_info_file): Likewise.
* transport.c (insert_packed_refs): Likewise.
Signed-off-by: NJim Meyering <meyering@redhat.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 95bf4bd4
...@@ -644,7 +644,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix) ...@@ -644,7 +644,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
die("'%s': %s", argv[1], strerror(errno)); die("'%s': %s", argv[1], strerror(errno));
while (fgets(buf, sizeof(buf), patterns)) { while (fgets(buf, sizeof(buf), patterns)) {
int len = strlen(buf); int len = strlen(buf);
if (buf[len-1] == '\n') if (len && buf[len-1] == '\n')
buf[len-1] = 0; buf[len-1] = 0;
/* ignore empty line like grep does */ /* ignore empty line like grep does */
if (!buf[0]) if (!buf[0])
......
...@@ -2013,7 +2013,7 @@ static void get_object_list(int ac, const char **av) ...@@ -2013,7 +2013,7 @@ static void get_object_list(int ac, const char **av)
while (fgets(line, sizeof(line), stdin) != NULL) { while (fgets(line, sizeof(line), stdin) != NULL) {
int len = strlen(line); int len = strlen(line);
if (line[len - 1] == '\n') if (len && line[len - 1] == '\n')
line[--len] = 0; line[--len] = 0;
if (!len) if (!len)
break; break;
......
...@@ -520,7 +520,7 @@ static void read_revisions_from_stdin(struct rev_info *revs) ...@@ -520,7 +520,7 @@ static void read_revisions_from_stdin(struct rev_info *revs)
while (fgets(line, sizeof(line), stdin) != NULL) { while (fgets(line, sizeof(line), stdin) != NULL) {
int len = strlen(line); int len = strlen(line);
if (line[len - 1] == '\n') if (len && line[len - 1] == '\n')
line[--len] = 0; line[--len] = 0;
if (!len) if (!len)
break; break;
......
...@@ -48,7 +48,7 @@ int read_bundle_header(const char *path, struct bundle_header *header) ...@@ -48,7 +48,7 @@ int read_bundle_header(const char *path, struct bundle_header *header)
: &header->references; : &header->references;
char delim; char delim;
if (buffer[len - 1] == '\n') if (len && buffer[len - 1] == '\n')
buffer[len - 1] = '\0'; buffer[len - 1] = '\0';
if (get_sha1_hex(buffer + offset, sha1)) { if (get_sha1_hex(buffer + offset, sha1)) {
warning("unrecognized header: %s", buffer); warning("unrecognized header: %s", buffer);
......
...@@ -101,7 +101,7 @@ static int read_pack_info_file(const char *infofile) ...@@ -101,7 +101,7 @@ static int read_pack_info_file(const char *infofile)
while (fgets(line, sizeof(line), fp)) { while (fgets(line, sizeof(line), fp)) {
int len = strlen(line); int len = strlen(line);
if (line[len-1] == '\n') if (len && line[len-1] == '\n')
line[--len] = 0; line[--len] = 0;
if (!len) if (!len)
......
...@@ -118,7 +118,7 @@ static void insert_packed_refs(const char *packed_refs, struct ref **list) ...@@ -118,7 +118,7 @@ static void insert_packed_refs(const char *packed_refs, struct ref **list)
if (hexval(buffer[0]) > 0xf) if (hexval(buffer[0]) > 0xf)
continue; continue;
len = strlen(buffer); len = strlen(buffer);
if (buffer[len - 1] == '\n') if (len && buffer[len - 1] == '\n')
buffer[--len] = '\0'; buffer[--len] = '\0';
if (len < 41) if (len < 41)
continue; continue;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册