aboutsummaryrefslogtreecommitdiff
path: root/src/ext
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-04-10 11:31:33 -0400
committerNick Mathewson <nickm@torproject.org>2019-04-10 11:31:33 -0400
commit412bcc5b2afcc965a6c8e6d09c3bda62df39bcc5 (patch)
tree3d1e5cf91c8f07c7d67a332938db4eef325bf8e2 /src/ext
parent454bdb22eeb4637a8bb5e40deb8454311f4ba4a2 (diff)
parent2cdc6b2005d2ad09b44cf9a455a70f258e7f6fca (diff)
downloadtor-412bcc5b2afcc965a6c8e6d09c3bda62df39bcc5.tar.gz
tor-412bcc5b2afcc965a6c8e6d09c3bda62df39bcc5.zip
Merge remote-tracking branch 'tor-github/pr/926' into maint-0.4.0
Diffstat (limited to 'src/ext')
-rw-r--r--src/ext/getdelim.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ext/getdelim.c b/src/ext/getdelim.c
index 8254103ff9..1c29baffd9 100644
--- a/src/ext/getdelim.c
+++ b/src/ext/getdelim.c
@@ -67,7 +67,8 @@ compat_getdelim_(char **buf, size_t *bufsiz, int delimiter, FILE *fp)
char *nbuf;
size_t nbufsiz = *bufsiz * 2;
ssize_t d = ptr - *buf;
- if ((nbuf = raw_realloc(*buf, nbufsiz)) == NULL)
+ if (nbufsiz < *bufsiz ||
+ (nbuf = raw_realloc(*buf, nbufsiz)) == NULL)
return -1;
*buf = nbuf;
*bufsiz = nbufsiz;