diff options
| author | Craig Rodrigues <rodrigc@FreeBSD.org> | 2014-10-06 14:43:02 +0000 |
|---|---|---|
| committer | Craig Rodrigues <rodrigc@FreeBSD.org> | 2014-10-06 14:43:02 +0000 |
| commit | ab7bf3d49dd665f0e210bd09b5e18dd1a261c903 (patch) | |
| tree | 843431d6fb738cd96b6bae6ae5db4659fe025bb8 /contrib/byacc | |
| parent | bbd5a84297fff9b8feebca09a57cc07781221a4e (diff) | |
MFV:
use calloc in get_line() when allocating line to ensure it is fully initialized,
fixes a later uninitialized value in copy_param() (FreeBSD #193499).
PR: 193499
Submitted by: Thomas E. Dickey <tom@invisible-island.net>
Notes
Notes:
svn path=/head/; revision=272649
Diffstat (limited to 'contrib/byacc')
| -rw-r--r-- | contrib/byacc/CHANGES | 6 | ||||
| -rw-r--r-- | contrib/byacc/defs.h | 1 | ||||
| -rw-r--r-- | contrib/byacc/reader.c | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/contrib/byacc/CHANGES b/contrib/byacc/CHANGES index c9d73ced986c..7d05c38188c6 100644 --- a/contrib/byacc/CHANGES +++ b/contrib/byacc/CHANGES @@ -1,3 +1,9 @@ +2014-10-02 Thomas E. Dickey <tom@invisible-island.net> + + * reader.c, defs.h: + use calloc in get_line() when allocating line to ensure it is fully initialized, + fixes a later uninitialized value in copy_param() (FreeBSD #193499). + 2014-07-15 Thomas E. Dickey <tom@invisible-island.net> * aclocal.m4: resync with my-autoconf (no change to configure script) diff --git a/contrib/byacc/defs.h b/contrib/byacc/defs.h index 58ebc8d66dcb..300b209e29ed 100644 --- a/contrib/byacc/defs.h +++ b/contrib/byacc/defs.h @@ -157,6 +157,7 @@ #define CALLOC(k,n) (calloc((size_t)(k),(size_t)(n))) #define FREE(x) (free((char*)(x))) #define MALLOC(n) (malloc((size_t)(n))) +#define TCMALLOC(t,n) ((t*) calloc((size_t)(n), sizeof(t))) #define TMALLOC(t,n) ((t*) malloc((size_t)(n) * sizeof(t))) #define NEW(t) ((t*)allocate(sizeof(t))) #define NEW2(n,t) ((t*)allocate(((size_t)(n)*sizeof(t)))) diff --git a/contrib/byacc/reader.c b/contrib/byacc/reader.c index 8312a69956a9..dfd36208e432 100644 --- a/contrib/byacc/reader.c +++ b/contrib/byacc/reader.c @@ -125,7 +125,7 @@ get_line(void) if (line) FREE(line); linesize = LINESIZE + 1; - line = TMALLOC(char, linesize); + line = TCMALLOC(char, linesize); NO_SPACE(line); } |