From: Bruno Haible <bruno@clisp.org>
Date: Mon, 17 May 2004 11:27:08 +0000 (+0000)
Subject: Fix for format strings like "%2.f".
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=325083763c51b8d7beb17a03e1db01a76fb98b07;p=pspp

Fix for format strings like "%2.f".
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 23d45e39b2..c784c8b080 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-14  Bruno Haible  <bruno@clisp.org>
+
+	* vasnprintf.c (VASNPRINTF): Correctly handle the case of a precision
+	that consists of a '.' followed by an empty digit string.
+	Patch by Tor Lillqvist <tml@iki.fi>.
+
 2004-05-17  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Port obstack to the AS/400, where pointers are 16 bytes wide and
diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
index c0754ead9a..0fa24708fe 100644
--- a/lib/vasnprintf.c
+++ b/lib/vasnprintf.c
@@ -1,5 +1,5 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-2004 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -315,9 +315,8 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
 			  const CHAR_T *digitp = dp->precision_start + 1;
 
 			  precision = 0;
-			  do
+			  while (digitp != dp->precision_end)
 			    precision = xsum (xtimes (precision, 10), *digitp++ - '0');
-			  while (digitp != dp->precision_end);
 			}
 		    }