[PATCH] strbuf: clear errno before calling getdelim(3)
- From
René Scharfe <l.s.r@web.de>
- Date
- Aug 10, 2017, 20:56 UTC
- Message-ID
- <cd49ce13-db87-89c1-77e7-998fdb9442c3@web.de>
- In-Reply-To
- <20170810200502.rutab4z3ft7gcpjz@sigill.intra.peff.net>
getdelim(3) returns -1 at the end of the file and if it encounters an error, but sets errno only in the latter case. Set errno to zero before calling it to avoid misdiagnosing an out-of-memory condition due to a left-over value from some other function call.
Reported-by: Yaroslav Halchenko <yoh@onerussian.com> Suggested-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Rene Scharfe <l.s.r@web.de> --- Do we need to save and restore the original value of errno? I doubt it, but didn't think deeply about it, yet.
strbuf.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/strbuf.c b/strbuf.c index 89d22e3b09..323c49ceb3 100644 --- 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) {
-- 2.14.0