diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-10-17 06:07:51 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-10-17 06:07:51 +0000 |
| commit | 2fc87aaf4f058bd3567ac9f2b5e11fcbd8145b30 (patch) | |
| tree | a68f80bfdd2783b171721145f8ef0653a7495e04 /lib/libedit/vi.c | |
| parent | edc23c755c5272dc39fee3694ffee0a4b023345d (diff) | |
Remove non-exposed malloc/realloc/free wrappers, and then substitute
reallocarray() where it helps.
ok doug
Diffstat (limited to 'lib/libedit/vi.c')
| -rw-r--r-- | lib/libedit/vi.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/libedit/vi.c b/lib/libedit/vi.c index cb17e859cab..a960e4290f6 100644 --- a/lib/libedit/vi.c +++ b/lib/libedit/vi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vi.c,v 1.11 2011/07/07 05:40:42 okan Exp $ */ +/* $OpenBSD: vi.c,v 1.12 2014/10/17 06:07:50 deraadt Exp $ */ /* $NetBSD: vi.c,v 1.33 2011/02/17 16:44:48 joerg Exp $ */ /*- @@ -1013,17 +1013,17 @@ vi_histedit(EditLine *el, Int c) return CC_ERROR; len = (size_t)(el->el_line.lastchar - el->el_line.buffer); #define TMP_BUFSIZ (EL_BUFSIZ * MB_LEN_MAX) - cp = el_malloc(TMP_BUFSIZ); + cp = malloc(TMP_BUFSIZ); if (cp == NULL) { close(fd); unlink(tempfile); return CC_ERROR; } - line = el_malloc(len * sizeof(*line)); + line = reallocarray(NULL, len, sizeof(*line)); if (line == NULL) { close(fd); unlink(tempfile); - el_free((ptr_t)cp); + free((ptr_t)cp); return CC_ERROR; } Strncpy(line, el->el_line.buffer, len); @@ -1038,8 +1038,8 @@ vi_histedit(EditLine *el, Int c) case -1: close(fd); unlink(tempfile); - el_free(cp); - el_free(line); + free(cp); + free(line); return CC_ERROR; case 0: close(fd); @@ -1062,8 +1062,8 @@ vi_histedit(EditLine *el, Int c) len = 0; el->el_line.cursor = el->el_line.buffer; el->el_line.lastchar = el->el_line.buffer + len; - el_free(cp); - el_free(line); + free(cp); + free(line); break; } |