diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-18 14:18:57 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-18 14:18:58 +0900 |
| commit | 6c9d19598d67008584132103f083a8badbd90d19 (patch) | |
| tree | 9daaf51f8014fa918e44a86158f290bb6df44a66 | |
| parent | 4010f1d1b782eb7585e0e0abcefa794bd5ff29a0 (diff) | |
| parent | 642956cf455ff8635be32b3160b12369da73cfe2 (diff) | |
| download | git-6c9d19598d67008584132103f083a8badbd90d19.tar.gz | |
Merge branch 'rs/strbuf-getwholeline-fix' into maint
A helper function to read a single whole line into strbuf
mistakenly triggered OOM error at EOF under certain conditions,
which has been fixed.
* rs/strbuf-getwholeline-fix:
strbuf: clear errno before calling getdelim(3)
| -rw-r--r-- | strbuf.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -476,6 +476,7 @@ int strbuf_getwholeline(struct strbuf *sb, FILE *fp, int term) /* Translate slopbuf to NULL, as we cannot call realloc on it */ if (!sb->alloc) sb->buf = NULL; + errno = 0; r = getdelim(&sb->buf, &sb->alloc, term, fp); if (r > 0) { |