diff options
| author | sheldonh <sheldonh@FreeBSD.org> | 2000-09-04 10:42:19 +0000 |
|---|---|---|
| committer | sheldonh <sheldonh@FreeBSD.org> | 2000-09-04 10:42:19 +0000 |
| commit | 8af19a0efa7cda30270bff0275dc1ebe3f9ea024 (patch) | |
| tree | ab50245fbcf35a1ce59e1a90e67cbab90b1d6381 /contrib/awk | |
| parent | a3f7b962cd5bd808c44ab10f9167907d008e96b4 (diff) | |
| download | FreeBSD-src-8af19a0efa7cda30270bff0275dc1ebe3f9ea024.zip FreeBSD-src-8af19a0efa7cda30270bff0275dc1ebe3f9ea024.tar.gz | |
Fix bug that causes gawk to choke when parsing long source files.
Reported by: Tony Fleisher <takhus@takhus.mind.net>
Submitted by: Aharon Robbins <arnold@skeeve.com>
Diffstat (limited to 'contrib/awk')
| -rw-r--r-- | contrib/awk/builtin.c | 6 | ||||
| -rw-r--r-- | contrib/awk/field.c | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/contrib/awk/builtin.c b/contrib/awk/builtin.c index 89babb3..fc9365b 100644 --- a/contrib/awk/builtin.c +++ b/contrib/awk/builtin.c @@ -2104,9 +2104,11 @@ size_t len; retval = (retval * 16) + val; } } else if (*str == '0') { + if (strchr(str, '8') != NULL || strchr(str, '9') != NULL) + goto decimal; for (; len > 0; len--) { - if (! isdigit(*str) || *str == '8' || *str == '9') - goto decimal; + if (! isdigit(*str)) + goto done; retval = (retval * 8) + (*str - '0'); str++; } diff --git a/contrib/awk/field.c b/contrib/awk/field.c index bd038a0..097196e 100644 --- a/contrib/awk/field.c +++ b/contrib/awk/field.c @@ -264,9 +264,13 @@ int freeold; emalloc(databuf, char *, INITIAL_SIZE, "set_record"); databuf_size = INITIAL_SIZE; } - /* make sure there's enough room */ - if (cnt > databuf_size) { - while (cnt > databuf_size && databuf_size <= MAX_SIZE) + /* + * Make sure there's enough room. Since we sometimes need + * to place a sentinel at the end, we make sure + * databuf_size is > cnt after allocation. + */ + if (cnt >= databuf_size) { + while (cnt >= databuf_size && databuf_size <= MAX_SIZE) databuf_size *= 2; erealloc(databuf, char *, databuf_size, "set_record"); } |
