aboutsummaryrefslogtreecommitdiff
path: root/src/ext
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-04-10 11:31:44 -0400
committerNick Mathewson <nickm@torproject.org>2019-04-10 11:31:44 -0400
commit3be1e26b8d27b9baa89549fff56fadd2894ec00f (patch)
tree3f5c7dc1b9d6e0b4e1e536042d97a18a364e4f40 /src/ext
parent60c46c6cd01092ccc17d5e8bd15778fd93d30d77 (diff)
parent412bcc5b2afcc965a6c8e6d09c3bda62df39bcc5 (diff)
downloadtor-3be1e26b8d27b9baa89549fff56fadd2894ec00f.tar.gz
tor-3be1e26b8d27b9baa89549fff56fadd2894ec00f.zip
Merge branch '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;