diff options
| author | Stefan Farfeleder <stefanf@FreeBSD.org> | 2005-08-07 08:35:39 +0000 |
|---|---|---|
| committer | Stefan Farfeleder <stefanf@FreeBSD.org> | 2005-08-07 08:35:39 +0000 |
| commit | 969f70013850f952bf41a8abfe728f632b6fd5fb (patch) | |
| tree | d825b4f4f7523e559e5839c88fab7eaae33f735e /lib | |
| parent | e000e0011875e76478b1a705bdb8a83835e4eedb (diff) | |
| download | src-969f70013850f952bf41a8abfe728f632b6fd5fb.tar.gz src-969f70013850f952bf41a8abfe728f632b6fd5fb.zip | |
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.
Notes
Notes:
svn path=/head/; revision=148814
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libedit/el.h | 1 | ||||
| -rw-r--r-- | lib/libedit/map.c | 4 | ||||
| -rw-r--r-- | lib/libedit/tokenizer.c | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/lib/libedit/el.h b/lib/libedit/el.h index dc1d257be895..655b3912b763 100644 --- a/lib/libedit/el.h +++ b/lib/libedit/el.h @@ -91,7 +91,6 @@ typedef struct el_state_t { */ #define el_malloc(a) malloc(a) #define el_realloc(a,b) realloc(a, b) -#define el_reallocf(a,b) reallocf(a, b) #define el_free(a) free(a) #include "tty.h" diff --git a/lib/libedit/map.c b/lib/libedit/map.c index 67c61cf56500..eae4da2a9298 100644 --- a/lib/libedit/map.c +++ b/lib/libedit/map.c @@ -1395,10 +1395,10 @@ map_addfunc(EditLine *el, const char *name, const char *help, el_func_t func) if (name == NULL || help == NULL || func == NULL) return (-1); - if ((p = el_reallocf(el->el_map.func, nf * sizeof(el_func_t))) == NULL) + if ((p = el_realloc(el->el_map.func, nf * sizeof(el_func_t))) == NULL) return (-1); el->el_map.func = (el_func_t *) p; - if ((p = el_reallocf(el->el_map.help, nf * sizeof(el_bindings_t))) + if ((p = el_realloc(el->el_map.help, nf * sizeof(el_bindings_t))) == NULL) return (-1); el->el_map.help = (el_bindings_t *) p; diff --git a/lib/libedit/tokenizer.c b/lib/libedit/tokenizer.c index 8c7ae8e36ca4..463a980bcad6 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); |