diegoripley/tippecanoe
1
0
Fork 0
mirror of https://github.com/felt/tippecanoe.git synced 2026-10-05 18:05:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Check for string length overflow

Browse Source
This commit is contained in:
Eric Fischer
2016-03-28 12:00:55 -07:00
parent 1e5d420b66
commit 21a635fb7a
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jsonpull.c
+10
View File
@@ -212,7 +212,12 @@ static void string_init(struct string *s) {
static void string_append(struct string *s, char c) { static void string_append(struct string *s, char c) {
if (s->n + 2 >= s->nalloc) { if (s->n + 2 >= s->nalloc) {
size_t prev = s->nalloc;
s->nalloc += 500; s->nalloc += 500;
if (s->nalloc <= prev) {
fprintf(stderr, "String size overflowed\n");
exit(EXIT_FAILURE);
}
s->buf = realloc(s->buf, s->nalloc); s->buf = realloc(s->buf, s->nalloc);
if (s->buf == NULL) { if (s->buf == NULL) {
perror("Out of memory"); perror("Out of memory");
@@ -228,7 +233,12 @@ static void string_append_string(struct string *s, char *add) {
size_t len = strlen(add); size_t len = strlen(add);
if (s->n + len + 1 >= s->nalloc) { if (s->n + len + 1 >= s->nalloc) {
size_t prev = s->nalloc;
s->nalloc += 500 + len; s->nalloc += 500 + len;
if (s->nalloc <= prev) {
fprintf(stderr, "String size overflowed\n");
exit(EXIT_FAILURE);
}
s->buf = realloc(s->buf, s->nalloc); s->buf = realloc(s->buf, s->nalloc);
if (s->buf == NULL) { if (s->buf == NULL) {
perror("Out of memory"); perror("Out of memory");