diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2015-04-28 16:46:05 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2015-04-28 16:46:05 +0300 |
| commit | 6853b3e94c03194200c5a7c4450820a8eaa0920f (patch) | |
| tree | 0e68baf9f5d687a0a3b6543f01522a56bf010279 /old-extension | |
| parent | 020be4cb81b519a597acbf85e683cfb95993c2b9 (diff) | |
| parent | b4ef28f58688cf3c3a5878c595b6582144ee2cf1 (diff) | |
| download | egawk-6853b3e94c03194200c5a7c4450820a8eaa0920f.tar.gz egawk-6853b3e94c03194200c5a7c4450820a8eaa0920f.tar.bz2 egawk-6853b3e94c03194200c5a7c4450820a8eaa0920f.zip | |
Merge branch 'master' into feature/regex-type
Diffstat (limited to 'old-extension')
| -rw-r--r-- | old-extension/ChangeLog | 9 | ||||
| -rw-r--r-- | old-extension/bindarr.c | 2 | ||||
| -rw-r--r-- | old-extension/fileop.c | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/old-extension/ChangeLog b/old-extension/ChangeLog index 55c8d31d..dad5c794 100644 --- a/old-extension/ChangeLog +++ b/old-extension/ChangeLog @@ -1,3 +1,12 @@ +2015-04-09 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * bindarr.c (do_bind_array): Undo Arnold's change of 2014-12-18. + +2014-12-18 Arnold D. Robbins <arnold@skeeve.com> + + * bindarr.c (do_bind_array): Do not waste a byte at the end of a string. + * fileop.c (do_fread): Ditto. + 2014-01-07 Arnold D. Robbins <arnold@skeeve.com> * dbarray.awk: Use full name for lib to load in extenstion() call. diff --git a/old-extension/bindarr.c b/old-extension/bindarr.c index 60959903..41467425 100644 --- a/old-extension/bindarr.c +++ b/old-extension/bindarr.c @@ -235,7 +235,7 @@ do_bind_array(int nargs) } /* copy the array -- this is passed as the second argument to the functions */ - emalloc(aname, char *, strlen(t->vname) + 2, "do_bind_array"); + emalloc(aname, char *, 1 + strlen(symbol->vname) + 1, "do_bind_array"); aname[0] = '~'; /* any illegal character */ strcpy(& aname[1], symbol->vname); td = make_array(); diff --git a/old-extension/fileop.c b/old-extension/fileop.c index 86f62576..d76a7ded 100644 --- a/old-extension/fileop.c +++ b/old-extension/fileop.c @@ -55,7 +55,7 @@ do_fread(int nargs) force_number(arg); rlen = get_number_ui(arg); - emalloc(rbuf, char *, rlen + 2, "do_fread"); + emalloc(rbuf, char *, rlen + 1, "do_fread"); if ((count = fread(rbuf, 1, rlen, f->fp)) < rlen) { if (! feof(f->fp)) update_ERRNO_int(errno); |