From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Kti6F-0003J4-Gd
	for qemu-devel@nongnu.org; Sat, 25 Oct 2008 08:18:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Kti6D-0003H2-Jk
	for qemu-devel@nongnu.org; Sat, 25 Oct 2008 08:18:34 -0400
Received: from [199.232.76.173] (port=36674 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Kti6D-0003Gr-Gb
	for qemu-devel@nongnu.org; Sat, 25 Oct 2008 08:18:33 -0400
Received: from wf-out-1314.google.com ([209.85.200.168]:26800)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <blauwirbel@gmail.com>) id 1Kti6D-0001mx-4j
	for qemu-devel@nongnu.org; Sat, 25 Oct 2008 08:18:33 -0400
Received: by wf-out-1314.google.com with SMTP id 27so1261523wfd.4
	for <qemu-devel@nongnu.org>; Sat, 25 Oct 2008 05:18:31 -0700 (PDT)
Message-ID: <f43fc5580810250518w7108201aocad17884c455837d@mail.gmail.com>
Date: Sat, 25 Oct 2008 15:18:31 +0300
From: "Blue Swirl" <blauwirbel@gmail.com>
Subject: Re: [Qemu-devel] [5532] Replace uses of strndup (a GNU extension)
	with Qemu pstrdup
In-Reply-To: <fb249edb0810250503n5742179aqfe1bab3928d1f4a5@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1KthEt-0006Tr-CT@cvs.savannah.gnu.org>
	<fb249edb0810250503n5742179aqfe1bab3928d1f4a5@mail.gmail.com>
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

On 10/25/08, andrzej zaborowski <balrogg@gmail.com> wrote:
> 2008/10/25 Blue Swirl <blauwirbel@gmail.com>:
>
> > Revision: 5532
>  >          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5532
>  > Author:   blueswir1
>  > Date:     2008-10-25 11:23:27 +0000 (Sat, 25 Oct 2008)
>  >
>  > Log Message:
>  > -----------
>  > Replace uses of strndup (a GNU extension) with Qemu pstrdup
>  >
>  > Modified Paths:
>  > --------------
>  >    trunk/cutils.c
>  >    trunk/hw/bt-hci.c
>  >    trunk/qemu-common.h
>  >
>  > Modified: trunk/cutils.c
>  > ===================================================================
>  > --- trunk/cutils.c      2008-10-25 11:21:28 UTC (rev 5531)
>  > +++ trunk/cutils.c      2008-10-25 11:23:27 UTC (rev 5532)
>  > @@ -50,6 +50,18 @@
>  >     return buf;
>  >  }
>  >
>  > +/* strdup with a limit */
>  > +char *pstrdup(const char *str, size_t buf_size)
>  > +{
>  > +    size_t len;
>  > +    char *buf;
>  > +
>  > +    len = MIN(buf_size, strlen(str));
>  > +    buf = qemu_malloc(len);
>  > +    pstrcpy(buf, len, str);
>  > +    return buf;
>  > +}
>
>
> I think here also pstrcpy will only copy up to buf_size - 1 characters
>  while strndup would copy buf_size chars.

That is actually safer if we always want the strings to be NUL terminated.

But the allocation length is wrong, it should be MIN(buf_size, strlen(str) + 1).