From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-104246-listarch-gdb-patches=sources.redhat.com@sourceware.org>
Received: (qmail 21230 invoked by alias); 13 Aug 2013 12:57:00 -0000
Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <gdb-patches.sourceware.org>
List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sourceware.org>
List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: gdb-patches-owner@sourceware.org
Received: (qmail 21216 invoked by uid 89); 13 Aug 2013 12:57:00 -0000
X-Spam-SWARE-Status: No, score=-5.0 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD autolearn=ham version=3.3.2
Received: from mms3.broadcom.com (HELO mms3.broadcom.com) (216.31.210.19)    by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Tue, 13 Aug 2013 12:56:59 +0000
Received: from [10.9.208.57] by mms3.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.5)); Tue, 13 Aug 2013 05:46:41 -0700
X-Server-Uuid: B86B6450-0931-4310-942E-F00ED04CA7AF
Received: from IRVEXCHSMTP1.corp.ad.broadcom.com (10.9.207.51) by IRVEXCHCAS08.corp.ad.broadcom.com (10.9.208.57) with Microsoft SMTP Server (TLS) id 14.1.438.0; Tue, 13 Aug 2013 05:56:42 -0700
Received: from mail-irva-13.broadcom.com (10.10.10.20) by IRVEXCHSMTP1.corp.ad.broadcom.com (10.9.207.51) with Microsoft SMTP Server id 14.1.438.0; Tue, 13 Aug 2013 05:56:42 -0700
Received: from [10.177.73.61] (unknown [10.177.73.61]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id CB651F2D73 for <gdb-patches@sourceware.org>; Tue, 13 Aug 2013 05:56:41 -0700 (PDT)
Message-ID: <520A2D08.4080600@broadcom.com>
Date: Tue, 13 Aug 2013 12:57:00 -0000
From: "Andrew Burgess" <aburgess@broadcom.com>
User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20130801 Thunderbird/17.0.8
MIME-Version: 1.0
To: "gdb-patches@sourceware.org" <gdb-patches@sourceware.org>
Subject: [PATCH] undefined printf format crashes gdb
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 7bit
X-SW-Source: 2013-08/txt/msg00340.txt.bz2

Current gdb HEAD:

  (gdb) printf "%#p", 0
  ./printcmd.c:2655: internal-error: ui_printf: Assertion `*p == 'p' && *(p + 1) == '\0'' failed.
  A problem internal to GDB has been detected,
  further debugging may prove unreliable.
  Quit this debugging session? (y or n) y

With my patch:

  (gdb) printf "%#p", 0
  Inappropriate modifiers to format specifier 'p' in printf

The man page for printf (on my machine) says # on pointers is undefined,
but my undefined seems better than the current undefined :) 

OK to apply?

Thanks,
Andrew



gdb/ChangeLog

2013-08-13  Andrew Burgess  <aburgess@broadcom.com>

	* common/format.c (parse_format_string): Don't allow '#' flag for
	pointer arguments in format string.

testsuite/ChangeLog

2013-08-13  Andrew Burgess  <aburgess@broadcom.com

	* gdb.base/printcmds.exp (test_printf): Add test for printf of
	pointer with various flags.

diff --git a/gdb/common/format.c b/gdb/common/format.c
index 1bdd253..985e0e4 100644
--- a/gdb/common/format.c
+++ b/gdb/common/format.c
@@ -263,7 +263,9 @@ parse_format_string (const char **arg)
 	    this_argclass = ptr_arg;
 	    if (lcount || seen_h || seen_big_l)
 	      bad = 1;
-	    if (seen_prec || seen_zero || seen_space || seen_plus)
+	    if (seen_prec)
+	      bad = 1;
+	    if (seen_hash || seen_zero || seen_space || seen_plus)
 	      bad = 1;
 	    break;
 
diff --git a/gdb/testsuite/gdb.base/printcmds.exp b/gdb/testsuite/gdb.base/printcmds.exp
index 4f88382..60e4a7f 100644
--- a/gdb/testsuite/gdb.base/printcmds.exp
+++ b/gdb/testsuite/gdb.base/printcmds.exp
@@ -734,6 +734,12 @@ proc test_printf {} {
     gdb_test "printf \"%.234\", 0" "Incomplete format specifier at end of format string"
     gdb_test "printf \"%-\", 0" "Incomplete format specifier at end of format string"
     gdb_test "printf \"%-23\", 0" "Incomplete format specifier at end of format string"
+
+    # Test for invalid printf flags on pointer types.
+    gdb_test "printf \"%#p\", 0" "Inappropriate modifiers to format specifier 'p' in printf"
+    gdb_test "printf \"% p\", 0" "Inappropriate modifiers to format specifier 'p' in printf"
+    gdb_test "printf \"%0p\", 0" "Inappropriate modifiers to format specifier 'p' in printf"
+    gdb_test "printf \"%+p\", 0" "Inappropriate modifiers to format specifier 'p' in printf"
 }
 
 #Test printing DFP values with printf