From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-70872-listarch-gdb-patches=sources.redhat.com@sourceware.org>
Received: (qmail 6473 invoked by alias); 8 Mar 2010 17:59:38 -0000
Received: (qmail 6465 invoked by uid 22791); 8 Mar 2010 17:59:38 -0000
X-SWARE-Spam-Status: No, hits=-7.1 required=5.0 	tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS
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; Mon, 08 Mar 2010 17:59:34 +0000
Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) 	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o28HxWbq030503 	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) 	for <gdb-patches@sourceware.org>; Mon, 8 Mar 2010 12:59:33 -0500
Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) 	by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o28HxVt2011993; 	Mon, 8 Mar 2010 12:59:32 -0500
Received: from opsy.redhat.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) 	by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id o28HxQ4b025150; 	Mon, 8 Mar 2010 12:59:31 -0500
Received: by opsy.redhat.com (Postfix, from userid 500) 	id D07953782A7; Mon,  8 Mar 2010 10:59:25 -0700 (MST)
From: Tom Tromey <tromey@redhat.com>
To: Sami Wagiaalla <swagiaal@redhat.com>
Cc: GDB Patches <gdb-patches@sourceware.org>
Subject: Re: [patch] Fix using_directive memory leak pr 11236
References: <4B8ECACA.9010504@redhat.com> <m3k4tt3wld.fsf@fleche.redhat.com> 	<4B9525DC.3000900@redhat.com>
Reply-To: Tom Tromey <tromey@redhat.com>
Date: Mon, 08 Mar 2010 17:59:00 -0000
In-Reply-To: <4B9525DC.3000900@redhat.com> (Sami Wagiaalla's message of "Mon, 	08 Mar 2010 11:29:16 -0500")
Message-ID: <m3vdd6vgn6.fsf@fleche.redhat.com>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
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: 2010-03/txt/msg00317.txt.bz2

>>>>> "Sami" == Sami Wagiaalla <swagiaal@redhat.com> writes:

Sami>     2010-03-08  Sami Wagiaalla  <swagiaal@redhat.com>
Sami>     	* cp-namespace.c (cp_add_using): Deleted.

Mention the PR in the ChangeLog entry.

Sami>        if (strcmp (current->import_src, src) == 0
Sami> -          && strcmp (current->import_dest, dest) == 0)
Sami> +          && strcmp (current->import_dest, dest) == 0
Sami> +          && ((!alias && !current->alias)
Sami> +              || strcmp (current->alias, alias) == 0))

I think this test is still wrong.

First, I think this will crash if alias==NULL but current->alias!=NULL,
or vice versa, because the code can still reach the strcmp.

Second, it doesn't really test the right thing.  I think you want
something like:

  && ((alias == NULL && current->alias == NULL)
      || (alias != NULL && current->alias != NULL
          && strcmp (alias, current->alias) == 0))

Tom