From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-93815-listarch-gdb-patches=sources.redhat.com@sourceware.org>
Received: (qmail 24008 invoked by alias); 15 Aug 2012 19:34:53 -0000
Received: (qmail 23870 invoked by uid 22791); 15 Aug 2012 19:34:52 -0000
X-SWARE-Spam-Status: No, hits=-6.5 required=5.0	tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W,SPF_HELO_PASS,T_RP_MATCHES_RCVD
X-Spam-Check-By: sourceware.org
Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28)    by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 15 Aug 2012 19:34:36 +0000
Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25])	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q7FJYVvY001474	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);	Wed, 15 Aug 2012 15:34:31 -0400
Received: from barimba (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1])	by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q7FJYSYR018252	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO);	Wed, 15 Aug 2012 15:34:29 -0400
From: Tom Tromey <tromey@redhat.com>
To: Andreas Schwab <schwab@linux-m68k.org>
Cc: Joel Brobecker <brobecker@adacore.com>, gdb-patches@sourceware.org
Subject: Re: creating the gdb-7.4 branch tomorrow (?)
References: <20111205081911.GG28486@adacore.com>	<m34nxdoawj.fsf@fleche.redhat.com> <m2vchfr3co.fsf@igel.home>
Date: Wed, 15 Aug 2012 19:34:00 -0000
In-Reply-To: <m2vchfr3co.fsf@igel.home> (Andreas Schwab's message of "Sun, 22	Jul 2012 21:40:55 +0200")
Message-ID: <87k3x0t0e3.fsf@fleche.redhat.com>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
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
X-SW-Source: 2012-08/txt/msg00444.txt.bz2

>>>>> "Andreas" == Andreas Schwab <schwab@linux-m68k.org> writes:

>> +static void
>> +filter_sals (struct symtabs_and_lines *sals)
>> +{
[...]
>> +  if (sals->nelts == 0)

Andreas> This is never true.  If sals->nelts == 0 on entry then it will
Andreas> always be set to 1, causing the caller to crash when
Andreas> dereferencing sals->sals.

This seems simplest.

Tom

2012-08-15  Tom Tromey  <tromey@redhat.com>

	* cli/cli-cmds.c (filter_sals): Handle nelts == 0 case.

diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 2a80803..5d8a124 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -1534,13 +1534,14 @@ filter_sals (struct symtabs_and_lines *sals)
 	  ++out;
 	}
     }
-  sals->nelts = out;
 
   if (sals->nelts == 0)
     {
       xfree (sals->sals);
       sals->sals = NULL;
     }
+  else
+    sals->nelts = out;
 }
 
 static void