On Tue, Dec 9, 2014 at 11:24 PM, Joseph Myers <jos...@codesourcery.com> wrote:
>> Attached patch checks the return value and sets ptr to NULL in this case.
>>
>> 2014-12-09 Uros Bizjak <ubiz...@gmail.com>
>>
>> * directives.c (cpp_define_formatted): Check return value of
>> vasprintf and in case of error set ptr to NULL.
>>
>> Bootstrapped on x86_64-linux-gnu.
>>
>> OK for mainline?
>
> No, this will just continue to pass NULL into cpp_define, and so into
> strlen, where it isn't a valid argument. You need to give an error
> message for allocation failure and exit, much like xmalloc does (or put
> xvasprintf in libiberty and use that here - see
> <https://gcc.gnu.org/ml/gcc-patches/2009-11/msg01448.html> and
> <https://gcc.gnu.org/ml/gcc-patches/2009-11/msg01449.html> - I don't know
> if that's the latest version).
Thanks for the pointers to the above patches. I have adapted the
referred patches to introduce xvasprintf to libibierty in order to use
it in libccp.
libiberty/ChangeLog:
2014-12-10 Uros Bizjak <ubiz...@gmail.com>
Ben Elliston <b...@au.ibm.com>
Manuel Lopez-Ibanez <m...@gcc.gnu.org>
* xvasprintf.c: New file.
* vprintf-support.h: Likewise.
* vprintf-support.c: Likewise.
* Makefile.in (CFILES): Add vprintf-support.c, xvasprintf.c.
(REQUIRED_OFILES): Add vprintf-support.$(objext), xvasprintf.$(objext).
(vprintf-support.$(objext), xvasprintf.$(objext)): New targets.
* functions.texi: Updated with documentation for xvasprintf.
* vasprintf.c (int_vasprintf): Use libiberty_vprintf_buffer_size.
include/ChangeLog:
2014-12-10 Uros Bizjak <ubiz...@gmail.com>
Ben Elliston <b...@au.ibm.com>
Manuel Lopez-Ibanez <m...@gcc.gnu.org>
* libiberty.h (xvasprintf): Declare.
libcpp/ChangeLog:
2014-12-10 Uros Bizjak <ubiz...@gmail.com>
* directives.c (cpp_define_formatted): Use xvasprintf.
Bootstrapped without warning on x86_64-linux-gnu and alphaev68-linux-gnu.
OK for mainline?
Index: include/libiberty.h
===================================================================
--- include/libiberty.h (revision 218585)
+++ include/libiberty.h (working copy)
@@ -636,6 +636,11 @@
extern int vasprintf (char **, const char *, va_list) ATTRIBUTE_PRINTF(2,0);
#endif
+/* Like vasprintf but allocates memory without fail. This works like
+ xmalloc. */
+
+extern char * xvasprintf (const char *, va_list) ATTRIBUTE_MALLOC
ATTRIBUTE_PRINTF(1,0);
+
#if defined(HAVE_DECL_SNPRINTF) && !HAVE_DECL_SNPRINTF
/* Like sprintf but prints at most N characters. */
extern int snprintf (char *, size_t, const char *, ...) ATTRIBUTE_PRINTF_3;
Index: libcpp/directives.c
===================================================================
--- libcpp/directives.c (revision 218592)
+++ libcpp/directives.c (working copy)
@@ -2404,11 +2404,11 @@
void
cpp_define_formatted (cpp_reader *pfile, const char *fmt, ...)
{
- char *ptr = NULL;
+ char *ptr;
va_list ap;
va_start (ap, fmt);
- vasprintf (&ptr, fmt, ap);
+ ptr = xvasprintf (fmt, ap);
va_end (ap);
cpp_define (pfile, ptr);
Index: libiberty/Makefile.in
===================================================================
--- libiberty/Makefile.in (revision 218585)
+++ libiberty/Makefile.in (working copy)
@@ -155,10 +155,11 @@
strtoll.c strtoul.c strtoull.c strndup.c strnlen.c \
strverscmp.c timeval-utils.c tmpnam.c \
unlink-if-ordinary.c \
- vasprintf.c vfork.c vfprintf.c vprintf.c vsnprintf.c vsprintf.c \
+ vasprintf.c vfork.c vfprintf.c vprintf.c vprintf-support.c \
+ vsnprintf.c vsprintf.c \
waitpid.c \
xatexit.c xexit.c xmalloc.c xmemdup.c xstrdup.c xstrerror.c \
- xstrndup.c
+ xstrndup.c xvasprintf.c
# These are always included in the library. The first four are listed
# first and by compile time to optimize parallel builds.
@@ -180,7 +181,7 @@
./obstack.$(objext) \
./partition.$(objext) ./pexecute.$(objext) ./physmem.$(objext) \
./pex-common.$(objext) ./pex-one.$(objext) \
- ./@pexecute@.$(objext) \
+ ./@pexecute@.$(objext) ./vprintf-support.$(objext) \
./safe-ctype.$(objext) \
./simple-object.$(objext) ./simple-object-coff.$(objext) \
./simple-object-elf.$(objext) ./simple-object-mach-o.$(objext) \
@@ -191,7 +192,7 @@
./timeval-utils.$(objext) ./unlink-if-ordinary.$(objext) \
./xatexit.$(objext) ./xexit.$(objext) ./xmalloc.$(objext) \
./xmemdup.$(objext) ./xstrdup.$(objext) ./xstrerror.$(objext) \
- ./xstrndup.$(objext)
+ ./xstrndup.$(objext) ./xvasprintf.$(objext)
# These are all the objects that configure may add to the library via
# $funcs or EXTRA_OFILES. This list exists here only for "make
@@ -1570,6 +1571,15 @@
else true; fi
$(COMPILE.c) $(srcdir)/vfprintf.c $(OUTPUT_OPTION)
+./vprintf-support.$(objext): $(srcdir)/vprintf-support.c $(INCDIR)/ansidecl.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/vprintf-support.c -o pic/$@; \
+ else true; fi
+ if [ x"$(NOASANFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(NOASANFLAG) $(srcdir)/vprintf-support.c -o
noasan/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/vprintf-support.c $(OUTPUT_OPTION)
+
./vprintf.$(objext): $(srcdir)/vprintf.c $(INCDIR)/ansidecl.h
if [ x"$(PICFLAG)" != x ]; then \
$(COMPILE.c) $(PICFLAG) $(srcdir)/vprintf.c -o pic/$@; \
@@ -1677,3 +1687,12 @@
else true; fi
$(COMPILE.c) $(srcdir)/xstrndup.c $(OUTPUT_OPTION)
+./xvasprintf.$(objext): $(srcdir)/xvasprintf.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h $(srcdir)/vprintf-support.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/xvasprintf.c -o pic/$@; \
+ else true; fi
+ if [ x"$(NOASANFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(NOASANFLAG) $(srcdir)/xvasprintf.c -o
noasan/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/xvasprintf.c $(OUTPUT_OPTION)
Index: libiberty/functions.texi
===================================================================
--- libiberty/functions.texi (revision 218585)
+++ libiberty/functions.texi (working copy)
@@ -2022,4 +2022,11 @@
@end deftypefn
+@c xvasprintf.c:3
+@deftypefn Replacement char * xvasprintf (const char *@var{format}, va_list
@var{args})
+Print to allocated string without fail. If @code{xvasprintf} fails,
+this will print a message to @code{stderr} (using the name set by
+@code{xmalloc_set_program_name}, if any) and then call @code{xexit}.
+
+@end deftypefn
Index: libiberty/vasprintf.c
===================================================================
--- libiberty/vasprintf.c (revision 218585)
+++ libiberty/vasprintf.c (working copy)
@@ -14,9 +14,9 @@
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
-License along with libiberty; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth
Floor,
-Boston, MA 02110-1301, USA. */
+License along with libiberty; see the file COPYING.LIB. If not, write
+to the Free Software Foundation, Inc., 51 Franklin Street - Fifth
+Floor, Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -33,10 +33,10 @@
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#else
-extern unsigned long strtoul ();
extern PTR malloc ();
#endif
#include "libiberty.h"
+#include "vprintf-support.h"
#ifdef TEST
int global_total_width;
@@ -64,81 +64,7 @@
static int
int_vasprintf (char **result, const char *format, va_list args)
{
- const char *p = format;
- /* Add one to make sure that it is never zero, which might cause malloc
- to return NULL. */
- int total_width = strlen (format) + 1;
- va_list ap;
-
-#ifdef va_copy
- va_copy (ap, args);
-#else
- memcpy ((PTR) &ap, (PTR) &args, sizeof (va_list));
-#endif
-
- while (*p != '\0')
- {
- if (*p++ == '%')
- {
- while (strchr ("-+ #0", *p))
- ++p;
- if (*p == '*')
- {
- ++p;
- total_width += abs (va_arg (ap, int));
- }
- else
- total_width += strtoul (p, (char **) &p, 10);
- if (*p == '.')
- {
- ++p;
- if (*p == '*')
- {
- ++p;
- total_width += abs (va_arg (ap, int));
- }
- else
- total_width += strtoul (p, (char **) &p, 10);
- }
- while (strchr ("hlL", *p))
- ++p;
- /* Should be big enough for any format specifier except %s and
floats. */
- total_width += 30;
- switch (*p)
- {
- case 'd':
- case 'i':
- case 'o':
- case 'u':
- case 'x':
- case 'X':
- case 'c':
- (void) va_arg (ap, int);
- break;
- case 'f':
- case 'e':
- case 'E':
- case 'g':
- case 'G':
- (void) va_arg (ap, double);
- /* Since an ieee double can have an exponent of 307, we'll
- make the buffer wide enough to cover the gross case. */
- total_width += 307;
- break;
- case 's':
- total_width += strlen (va_arg (ap, char *));
- break;
- case 'p':
- case 'n':
- (void) va_arg (ap, char *);
- break;
- }
- p++;
- }
- }
-#ifdef va_copy
- va_end (ap);
-#endif
+ int total_width = libiberty_vprintf_buffer_size (format, args);
#ifdef TEST
global_total_width = total_width;
#endif
Index: libiberty/vprintf-support.c
===================================================================
--- libiberty/vprintf-support.c (revision 0)
+++ libiberty/vprintf-support.c (working copy)
@@ -0,0 +1,119 @@
+/* Estimate the length of the string generated by a vprintf-like
+ function. Used by vasprintf and xvasprintf.
+ Copyright (C) 1994, 2003, 2011, 2013, 2014 Free Software Foundation, Inc.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB. If not, write
+to the Free Software Foundation, Inc., 51 Franklin Street - Fifth
+Floor, Boston, MA 02110-1301, USA. */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include <ansidecl.h>
+#include <stdarg.h>
+#if !defined (va_copy) && defined (__va_copy)
+# define va_copy(d,s) __va_copy((d),(s))
+#endif
+#include <stdio.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#else
+extern unsigned long strtoul ();
+#endif
+#include "libiberty.h"
+
+int
+libiberty_vprintf_buffer_size (const char *format, va_list args)
+{
+ const char *p = format;
+ /* Add one to make sure that it is never zero, which might cause malloc
+ to return NULL. */
+ int total_width = strlen (format) + 1;
+ va_list ap;
+
+#ifdef va_copy
+ va_copy (ap, args);
+#else
+ memcpy ((PTR) &ap, (PTR) &args, sizeof (va_list));
+#endif
+
+ while (*p != '\0')
+ {
+ if (*p++ == '%')
+ {
+ while (strchr ("-+ #0", *p))
+ ++p;
+ if (*p == '*')
+ {
+ ++p;
+ total_width += abs (va_arg (ap, int));
+ }
+ else
+ total_width += strtoul (p, (char **) &p, 10);
+ if (*p == '.')
+ {
+ ++p;
+ if (*p == '*')
+ {
+ ++p;
+ total_width += abs (va_arg (ap, int));
+ }
+ else
+ total_width += strtoul (p, (char **) &p, 10);
+ }
+ while (strchr ("hlL", *p))
+ ++p;
+ /* Should be big enough for any format specifier except %s and
floats. */
+ total_width += 30;
+ switch (*p)
+ {
+ case 'd':
+ case 'i':
+ case 'o':
+ case 'u':
+ case 'x':
+ case 'X':
+ case 'c':
+ (void) va_arg (ap, int);
+ break;
+ case 'f':
+ case 'e':
+ case 'E':
+ case 'g':
+ case 'G':
+ (void) va_arg (ap, double);
+ /* Since an ieee double can have an exponent of 307, we'll
+ make the buffer wide enough to cover the gross case. */
+ total_width += 307;
+ break;
+ case 's':
+ total_width += strlen (va_arg (ap, char *));
+ break;
+ case 'p':
+ case 'n':
+ (void) va_arg (ap, char *);
+ break;
+ }
+ p++;
+ }
+ }
+#ifdef va_copy
+ va_end (ap);
+#endif
+ return total_width;
+}
Index: libiberty/vprintf-support.h
===================================================================
--- libiberty/vprintf-support.h (revision 0)
+++ libiberty/vprintf-support.h (working copy)
@@ -0,0 +1,22 @@
+/* Estimate the length of the string generated by a vprintf-like
+ function. Use by vasprintf and xvasprintf.
+ Copyright (C) 1994, 2003, 2009 Free Software Foundation, Inc.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB. If not, write
+to the Free Software Foundation, Inc., 51 Franklin Street - Fifth
+Floor, Boston, MA 02110-1301, USA. */
+
+
+extern int libiberty_vprintf_buffer_size (const char *, va_list);
Index: libiberty/xvasprintf.c
===================================================================
--- libiberty/xvasprintf.c (revision 0)
+++ libiberty/xvasprintf.c (working copy)
@@ -0,0 +1,61 @@
+/* Implement the xvasprintf function.
+ Copyright (C) 2014 Free Software Foundation, Inc.
+ Contributed by Manuel Lopez-Ibanez.
+
+This file is part of the libiberty library.
+Libiberty is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+Libiberty is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with libiberty; see the file COPYING.LIB. If not, write
+to the Free Software Foundation, Inc., 51 Franklin Street - Fifth
+Floor, Boston, MA 02110-1301, USA. */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include <ansidecl.h>
+#include <stdarg.h>
+#if !defined (va_copy) && defined (__va_copy)
+# define va_copy(d,s) __va_copy((d),(s))
+#endif
+#include <stdio.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#include "libiberty.h"
+#include "vprintf-support.h"
+
+/*
+
+@deftypefn Replacement char * xvasprintf (const char *@var{format}, va_list
@var{args})
+
+Print to allocated string without fail. If @code{xvasprintf} fails,
+this will print a message to @code{stderr} (using the name set by
+@code{xmalloc_set_program_name}, if any) and then call @code{xexit}.
+
+@end deftypefn
+
+*/
+
+char *
+xvasprintf (const char *format,
+#if defined (_BSD_VA_LIST_) && defined (__FreeBSD__)
+ _BSD_VA_LIST_ args)
+#else
+ va_list args)
+#endif
+{
+ char * result;
+ int total_width = libiberty_vprintf_buffer_size (format, args);
+ result = (char *) xmalloc (total_width);
+ vsprintf (result, format, args);
+ return result;
+}
