From b174130c91a93b08e7465c8f0a4e66dd9cfd46be Mon Sep 17 00:00:00 2001 From: Felicity Tarnell Date: Fri, 7 Mar 2014 16:11:23 +0000 Subject: [PATCH] T.83.6: Incorrect memory allocation in configuration parser. --- configure | 18 +++++++++--------- configure.ac | 2 +- tts.c | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/configure b/configure index e969348..a3798e9 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for RT/TTS T.83.5. +# Generated by GNU Autoconf 2.69 for RT/TTS T.83.6. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='RT/TTS' PACKAGE_TARNAME='rt-tts' -PACKAGE_VERSION='T.83.5' -PACKAGE_STRING='RT/TTS T.83.5' +PACKAGE_VERSION='T.83.6' +PACKAGE_STRING='RT/TTS T.83.6' PACKAGE_BUGREPORT='felicity@loreley.flyingparchment.org.uk' PACKAGE_URL='' @@ -1232,7 +1232,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures RT/TTS T.83.5 to adapt to many kinds of systems. +\`configure' configures RT/TTS T.83.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1293,7 +1293,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of RT/TTS T.83.5:";; + short | recursive ) echo "Configuration of RT/TTS T.83.6:";; esac cat <<\_ACEOF @@ -1380,7 +1380,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -RT/TTS configure T.83.5 +RT/TTS configure T.83.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1749,7 +1749,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by RT/TTS $as_me T.83.5, which was +It was created by RT/TTS $as_me T.83.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4766,7 +4766,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by RT/TTS $as_me T.83.5, which was +This file was extended by RT/TTS $as_me T.83.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4828,7 +4828,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -RT/TTS config.status T.83.5 +RT/TTS config.status T.83.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 3101cda..05984dd 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT([RT/TTS], [T.83.5], [felicity@loreley.flyingparchment.org.uk]) +AC_INIT([RT/TTS], [T.83.6], [felicity@loreley.flyingparchment.org.uk]) AC_CONFIG_SRCDIR([tts.c]) AC_CONFIG_HEADERS([config.h]) diff --git a/tts.c b/tts.c index f904518..495e385 100644 --- a/tts.c +++ b/tts.c @@ -2484,7 +2484,7 @@ const WCHAR *p, *q; /* Copy the argument (which is sz bytes long) into the result array */ sz = (q - p); *res = realloc(*res, sizeof(WCHAR *) * (ntoks + 1)); - (*res)[ntoks] = malloc(sizeof(WCHAR) * sz + 1); + (*res)[ntoks] = malloc(sizeof(WCHAR) * (sz + 1)); MEMCPY((*res)[ntoks], p, sz); (*res)[ntoks][sz] = 0; ntoks++;