Date: Sat, 11 Oct 2014 19:28:23 +0000 (UTC) From: Craig Rodrigues <rodrigc@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r272954 - stable/10/contrib/byacc Message-ID: <201410111928.s9BJSNLs040395@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rodrigc Date: Sat Oct 11 19:28:22 2014 New Revision: 272954 URL: https://svnweb.freebsd.org/changeset/base/272954 Log: 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 <tom@invisible-island.net> Modified: stable/10/contrib/byacc/CHANGES stable/10/contrib/byacc/defs.h stable/10/contrib/byacc/reader.c Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/byacc/CHANGES ============================================================================== --- stable/10/contrib/byacc/CHANGES Sat Oct 11 19:18:00 2014 (r272953) +++ stable/10/contrib/byacc/CHANGES Sat Oct 11 19:28:22 2014 (r272954) @@ -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) Modified: stable/10/contrib/byacc/defs.h ============================================================================== --- stable/10/contrib/byacc/defs.h Sat Oct 11 19:18:00 2014 (r272953) +++ stable/10/contrib/byacc/defs.h Sat Oct 11 19:28:22 2014 (r272954) @@ -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)))) Modified: stable/10/contrib/byacc/reader.c ============================================================================== --- stable/10/contrib/byacc/reader.c Sat Oct 11 19:18:00 2014 (r272953) +++ stable/10/contrib/byacc/reader.c Sat Oct 11 19:28:22 2014 (r272954) @@ -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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410111928.s9BJSNLs040395>