From bc2836b323820361f52c7499753160125f30a40c Mon Sep 17 00:00:00 2001 From: rodrigc Date: Sat, 11 Oct 2014 19:28:22 +0000 Subject: [PATCH] Merge: r272649 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 git-svn-id: svn://svn.freebsd.org/base/stable/10@272954 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- contrib/byacc/CHANGES | 6 ++++++ contrib/byacc/defs.h | 1 + contrib/byacc/reader.c | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/contrib/byacc/CHANGES b/contrib/byacc/CHANGES index c9d73ced9..7d05c3818 100644 --- a/contrib/byacc/CHANGES +++ b/contrib/byacc/CHANGES @@ -1,3 +1,9 @@ +2014-10-02 Thomas E. Dickey + + * 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 * aclocal.m4: resync with my-autoconf (no change to configure script) diff --git a/contrib/byacc/defs.h b/contrib/byacc/defs.h index 58ebc8d66..300b209e2 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 8312a6995..dfd36208e 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); } -- 2.45.0