* vasprintf.c (int_vasprintf): Don't re-read the format character

as this mishandles strings like '%%s'.

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 8972f1f..fed58dd 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+1999-12-27  Geoff Keating  <geoffk@cygnus.com>
+
+       * vasprintf.c (int_vasprintf): Don't re-read the format character
+       as this mishandles strings like '%%s'.
+
 1999-08-03  Ian Lance Taylor  <ian@zembu.com>
 
        * floatformat.c: Add casts to avoid signed/unsigned warnings.

diff --git a/libiberty/vasprintf.c b/libiberty/vasprintf.c
index eeb80e6..b959f5f 100644 (file)
--- a/libiberty/vasprintf.c
+++ b/libiberty/vasprintf.c
@@ -105,6 +105,7 @@ int_vasprintf (result, format, args)
              (void) va_arg (ap, char *);
              break;
            }
+         p++;
        }
     }
 #ifdef TEST