diff options
Diffstat (limited to 'extension')
| -rw-r--r-- | extension/ChangeLog | 11 | ||||
| -rw-r--r-- | extension/filefuncs.c | 6 | ||||
| -rw-r--r-- | extension/inplace.c | 6 | ||||
| -rw-r--r-- | extension/readdir.c | 4 | ||||
| -rw-r--r-- | extension/readfile.c | 2 | ||||
| -rw-r--r-- | extension/revtwoway.c | 4 | ||||
| -rw-r--r-- | extension/rwarray.c | 6 | ||||
| -rw-r--r-- | extension/testext.c | 4 |
8 files changed, 27 insertions, 16 deletions
diff --git a/extension/ChangeLog b/extension/ChangeLog index bde626de..4a1fe2ed 100644 --- a/extension/ChangeLog +++ b/extension/ChangeLog @@ -1,3 +1,14 @@ +2014-03-08 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * filefuncs.c (read_symlink, do_fts): Replace free with gawk_free. + * inplace.c (at_exit, do_inplace_end): Ditto. + * readdir.c (dir_close): Ditto. + * readfile.c (do_readfile): Ditto. + * revtwoway.c (close_two_proc_data): Ditto. + * rwarray (read_elem): Replace realloc with gawk_realloc. + (read_value): Replace malloc and free with gawk_malloc and gawk_free. + * testext.c (try_modify_environ): Replace free with gawk_free. + 2014-02-12 John E. Malmberg <wb8tyw@qsl.net> * time.c: Better hack for nanosleep bug based on feedback from HP. diff --git a/extension/filefuncs.c b/extension/filefuncs.c index 3eb2a6b5..58acab4d 100644 --- a/extension/filefuncs.c +++ b/extension/filefuncs.c @@ -284,7 +284,7 @@ read_symlink(const char *fname, size_t bufsize, ssize_t *linksize) returns -1 with errno == ERANGE if the buffer is too small. */ if (errno != ERANGE) { - free(buf); + gawk_free(buf); return NULL; } } @@ -293,7 +293,7 @@ read_symlink(const char *fname, size_t bufsize, ssize_t *linksize) buf[*linksize] = '\0'; return buf; } - free(buf); + gawk_free(buf); if (bufsize <= MAXSIZE/2) bufsize *= 2; else if (bufsize < MAXSIZE) @@ -854,7 +854,7 @@ do_fts(int nargs, awk_value_t *result) out: if (pathvector != NULL) - free(pathvector); + gawk_free(pathvector); if (path_array != NULL) (void) release_flattened_array(pathlist.array_cookie, path_array); diff --git a/extension/inplace.c b/extension/inplace.c index 91b1a229..b6228a5b 100644 --- a/extension/inplace.c +++ b/extension/inplace.c @@ -96,7 +96,7 @@ at_exit(void *data, int exit_status) (void) exit_status; /* silence warnings */ if (state.tname) { unlink(state.tname); - free(state.tname); + gawk_free(state.tname); state.tname = NULL; } } @@ -242,7 +242,7 @@ do_inplace_end(int nargs, awk_value_t *result) if (link(filename.str_value.str, bakname) < 0) fatal(ext_id, _("inplace_end: link(`%s', `%s') failed (%s)"), filename.str_value.str, bakname, strerror(errno)); - free(bakname); + gawk_free(bakname); } #ifdef __MINGW32__ @@ -252,7 +252,7 @@ do_inplace_end(int nargs, awk_value_t *result) if (rename(state.tname, filename.str_value.str) < 0) fatal(ext_id, _("inplace_end: rename(`%s', `%s') failed (%s)"), state.tname, filename.str_value.str, strerror(errno)); - free(state.tname); + gawk_free(state.tname); state.tname = NULL; return make_number(0, result); } diff --git a/extension/readdir.c b/extension/readdir.c index 91296801..5b9a7913 100644 --- a/extension/readdir.c +++ b/extension/readdir.c @@ -235,8 +235,8 @@ dir_close(awk_input_buf_t *iobuf) the_dir = (open_directory_t *) iobuf->opaque; closedir(the_dir->dp); - free(the_dir->buf); - free(the_dir); + gawk_free(the_dir->buf); + gawk_free(the_dir); iobuf->fd = -1; } diff --git a/extension/readfile.c b/extension/readfile.c index 06889c3d..71d67ee6 100644 --- a/extension/readfile.c +++ b/extension/readfile.c @@ -107,7 +107,7 @@ do_readfile(int nargs, awk_value_t *result) if ((ret = read(fd, text, sbuf.st_size)) != sbuf.st_size) { (void) close(fd); update_ERRNO_int(errno); - free(text); + gawk_free(text); goto done; } diff --git a/extension/revtwoway.c b/extension/revtwoway.c index 5f490825..675e0efa 100644 --- a/extension/revtwoway.c +++ b/extension/revtwoway.c @@ -119,8 +119,8 @@ close_two_proc_data(two_way_proc_data_t *proc_data) return; } - free(proc_data->data); - free(proc_data); + gawk_free(proc_data->data); + gawk_free(proc_data); } /* diff --git a/extension/rwarray.c b/extension/rwarray.c index 6185000b..940acd62 100644 --- a/extension/rwarray.c +++ b/extension/rwarray.c @@ -408,7 +408,7 @@ read_elem(FILE *fp, awk_element_t *element) buflen = index_len; } else if (buflen < index_len) { /* reallocate buffer */ - char *cp = realloc(buffer, index_len); + char *cp = gawk_realloc(buffer, index_len); if (cp == NULL) return awk_false; @@ -468,11 +468,11 @@ read_value(FILE *fp, awk_value_t *value) len = ntohl(len); value->val_type = AWK_STRING; value->str_value.len = len; - value->str_value.str = malloc(len + 2); + value->str_value.str = gawk_malloc(len + 2); memset(value->str_value.str, '\0', len + 2); if (fread(value->str_value.str, 1, len, fp) != (ssize_t) len) { - free(value->str_value.str); + gawk_free(value->str_value.str); return awk_false; } } diff --git a/extension/testext.c b/extension/testext.c index d11272b8..22f2eb84 100644 --- a/extension/testext.c +++ b/extension/testext.c @@ -237,8 +237,8 @@ try_modify_environ(int nargs, awk_value_t *result) printf("try_modify_environ: set_array_element of ENVIRON passed\n"); } else { printf("try_modify_environ: set_array_element of ENVIRON failed\n"); - free(index.str_value.str); - free(value.str_value.str); + gawk_free(index.str_value.str); + gawk_free(value.str_value.str); } if (! flatten_array(environ_array, & flat_array)) { |