From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17837 invoked by alias); 13 Mar 2002 12:36:15 -0000 Mailing-List: contact libc-hacker-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sources.redhat.com Received: (qmail 17768 invoked from network); 13 Mar 2002 12:36:13 -0000 Received: from unknown (HELO Cantor.suse.de) (213.95.15.193) by sources.redhat.com with SMTP; 13 Mar 2002 12:36:13 -0000 Received: from Hermes.suse.de (Hermes.suse.de [213.95.15.136]) by Cantor.suse.de (Postfix) with ESMTP id AA82B1E52A for ; Wed, 13 Mar 2002 13:36:12 +0100 (MET) X-Authentication-Warning: sykes.suse.de: schwab set sender to schwab@suse.de using -f To: libc-hacker@sources.redhat.com Subject: vfprintf with positional arg and 'h' flag X-Yow: Yow! I'm UNEMPLOYED! From: Andreas Schwab Date: Wed, 13 Mar 2002 04:36:00 -0000 Message-ID: User-Agent: Gnus/5.090005 (Oort Gnus v0.05) Emacs/21.2.50 (ia64-suse-linux) MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-SW-Source: 2002-03/txt/msg00044.txt.bz2 This fixes the use of the 'h' flag together with positional arguments, giving wrong output on big-endian, and reading uninitialized memory on little-endian. Andreas. 2002-03-02 Andreas Schwab * stdio-common/vfprintf.c (process_arg): Fix decimal format with 'h' flag and positional arg. * tst-printf.c (rfg3): New function to test positional arguments. (main): Fix some warnings. --- stdio-common/tst-printf.c.~1.14.~ 2001-07-16 10:43:53.000000000 +0200 +++ stdio-common/tst-printf.c 2002-03-13 13:25:30.000000000 +0100 @@ -1,4 +1,5 @@ -/* Copyright (C) 1991,92,93,95,96,97,98,99, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1991,92,93,95,96,97,98,99, 2000, 2002 + Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -30,6 +31,7 @@ static void rfg1 (void); static void rfg2 (void); +static void rfg3 (void); static void @@ -159,7 +161,7 @@ printf("long octal negative:\t\"%lo\"\n", -2345L); printf("long unsigned decimal number:\t\"%lu\"\n", -123456L); printf("zero-padded LDN:\t\"%010ld\"\n", -123456L); - printf("left-adjusted ZLDN:\t\"%-010ld\"\n", -123456); + printf("left-adjusted ZLDN:\t\"%-010ld\"\n", -123456L); printf("space-padded LDN:\t\"%10ld\"\n", -123456L); printf("left-adjusted SLDN:\t\"%-10ld\"\n", -123456L); @@ -218,8 +220,9 @@ char buf[20]; char buf2[512]; printf ("snprintf (\"%%30s\", \"foo\") == %d, \"%.*s\"\n", - snprintf (buf, sizeof (buf), "%30s", "foo"), sizeof (buf), buf); - printf ("snprintf (\"%%.999999u\", 10)\n", + snprintf (buf, sizeof (buf), "%30s", "foo"), (int) sizeof (buf), + buf); + printf ("snprintf (\"%%.999999u\", 10) == %d\n", snprintf(buf2, sizeof(buf2), "%.999999u", 10)); } @@ -269,6 +272,7 @@ puts ("--- Should be no further output. ---"); rfg1 (); rfg2 (); + rfg3 (); { char bytes[7]; @@ -352,3 +356,23 @@ if (strcmp (buf, " 021") != 0) printf ("got: '%s', expected: '%s'\n", buf, " 021"); } + +static void +rfg3 (void) +{ + char buf[100]; + double g = 5.0000001; + unsigned long l = 1234567890; + double d = 321.7654321; + char *s = "test-string"; + int i = 12345; + int h = 1234; + + sprintf (buf, + "%1$*5$d %2$*6$hi %3$*7$lo %4$*8$f %9$*12$e %10$*13$g %11$*14$s", + i, h, l, d, 8, 5, 14, 14, d, g, s, 14, 3, 14); + if (strcmp (buf, + " 12345 1234 11145401322 321.765432 3.217654e+02 5 test-string") != 0) + printf ("got: '%s', expected: '%s'\n", buf, + " 12345 1234 11145401322 321.765432 3.217654e+02 5 test-string"); +} Index: stdio-common/vfprintf.c =================================================================== RCS file: /cvs/glibc/libc/stdio-common/vfprintf.c,v retrieving revision 1.106 diff -u -a -u -r1.106 vfprintf.c --- stdio-common/vfprintf.c 2002/03/11 20:59:45 1.106 +++ stdio-common/vfprintf.c 2002/03/13 12:10:20 @@ -581,8 +581,10 @@ else \ if (is_long_num) \ signed_number = args_value[fspec->data_arg].pa_long_int; \ - else \ + else if (!is_short) \ signed_number = args_value[fspec->data_arg].pa_int; \ + else \ + signed_number = args_value[fspec->data_arg].pa_short_int; \ \ is_negative = signed_number < 0; \ number.word = is_negative ? (- signed_number) : signed_number; \ -- Andreas Schwab, SuSE Labs, schwab@suse.de SuSE GmbH, Deutschherrnstr. 15-19, D-90429 Nürnberg Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."