Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'rs/strbuf-getwholeline-fix'
author
Junio C Hamano
<gitster@pobox.com>
Tue, 22 Aug 2017 17:29:15 +0000
(10:29 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 22 Aug 2017 17:29:15 +0000
(10:29 -0700)
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)
strbuf.c
patch
|
blob
|
history
raw
(from parent 1:
e2a2a1d
)
diff --git
a/strbuf.c
b/strbuf.c
index 89d22e3b0903a220fa958b8d912607828ab2a9ba..323c49ceb35cb053434248df869578e649ccadc0 100644
(file)
--- a/
strbuf.c
+++ b/
strbuf.c
@@
-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) {