vasnprintf: Fix crash in %ls directive.

[gnulib.git] / lib / inttostr.c

diff --git a/lib/inttostr.c b/lib/inttostr.c
index 246d658..7a4a47f 100644 (file)
--- a/lib/inttostr.c
+++ b/lib/inttostr.c
@@ -1,11 +1,11 @@
 /* inttostr.c -- convert integers to printable strings
 
-   Copyright (C) 2001, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,14 +13,14 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert */
 
 #include <config.h>
 
 #include "inttostr.h"
+#include "verify.h"
 
 /* Convert I to a printable string in BUF, which must be at least
    INT_BUFSIZE_BOUND (INTTYPE) bytes long.  Return the address of the
@@ -29,21 +29,24 @@
 char *
 inttostr (inttype i, char *buf)
 {
+  verify (TYPE_SIGNED (inttype) == inttype_is_signed);
   char *p = buf + INT_STRLEN_BOUND (inttype);
   *p = 0;
 
+#if inttype_is_signed
   if (i < 0)
     {
       do
-       *--p = '0' - i % 10;
+        *--p = '0' - i % 10;
       while ((i /= 10) != 0);
 
       *--p = '-';
     }
   else
+#endif
     {
       do
-       *--p = '0' + i % 10;
+        *--p = '0' + i % 10;
       while ((i /= 10) != 0);
     }