diff options
| author | stefanf <stefanf@FreeBSD.org> | 2005-08-07 08:35:39 +0000 |
|---|---|---|
| committer | stefanf <stefanf@FreeBSD.org> | 2005-08-07 08:35:39 +0000 |
| commit | 7907f74429f7c0fd75c643f450bb1e813c444315 (patch) | |
| tree | d825b4f4f7523e559e5839c88fab7eaae33f735e /lib/libedit/tokenizer.c | |
| parent | 449d4474b42c2ce47f7067f0435eb71eda24bd52 (diff) | |
| download | FreeBSD-src-7907f74429f7c0fd75c643f450bb1e813c444315.zip FreeBSD-src-7907f74429f7c0fd75c643f450bb1e813c444315.tar.gz | |
Revert the replacement of realloc() with reallocf() (el.h:1.2, map.c:1.5 and
tokenizer.c:1.3). Contrary to the commit log there were no memory leaks,
but the change introduced a bug because the free'd pointer was not zeroed
and calling the appropriate _end() function would call free() a second time.
Diffstat (limited to 'lib/libedit/tokenizer.c')
| -rw-r--r-- | lib/libedit/tokenizer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/libedit/tokenizer.c b/lib/libedit/tokenizer.c index 8c7ae8e..463a980 100644 --- a/lib/libedit/tokenizer.c +++ b/lib/libedit/tokenizer.c @@ -65,7 +65,6 @@ typedef enum { #define tok_malloc(a) malloc(a) #define tok_free(a) free(a) #define tok_realloc(a, b) realloc(a, b) -#define tok_reallocf(a, b) reallocf(a, b) struct tokenizer { @@ -386,7 +385,7 @@ tok_line(Tokenizer *tok, const char *line, int *argc, char ***argv) if (tok->argc >= tok->amax - 4) { char **p; tok->amax += AINCR; - p = (char **) tok_reallocf(tok->argv, + p = (char **) tok_realloc(tok->argv, tok->amax * sizeof(char *)); if (p == NULL) return (-1); |
