From owner-svn-src-all@FreeBSD.ORG  Sun Oct  4 19:43:38 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 71671106568F;
	Sun,  4 Oct 2009 19:43:38 +0000 (UTC) (envelope-from das@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 615B38FC19;
	Sun,  4 Oct 2009 19:43:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n94JhaLR083489;
	Sun, 4 Oct 2009 19:43:36 GMT (envelope-from das@svn.freebsd.org)
Received: (from das@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n94JhaDg083487;
	Sun, 4 Oct 2009 19:43:36 GMT (envelope-from das@svn.freebsd.org)
Message-Id: <200910041943.n94JhaDg083487@svn.freebsd.org>
From: David Schultz <das@FreeBSD.org>
Date: Sun, 4 Oct 2009 19:43:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197752 - head/lib/libc/stdio
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Oct 2009 19:43:38 -0000

Author: das
Date: Sun Oct  4 19:43:36 2009
New Revision: 197752
URL: http://svn.freebsd.org/changeset/base/197752

Log:
  Better glibc compatibility for getline/getdelim:
  
  - Tolerate applications that pass a NULL pointer for the buffer and
    claim that the capacity of the buffer is nonzero.
  
  - If an application passes in a non-NULL buffer pointer and claims the
    buffer has zero capacity, we should free (well, realloc) it
    anyway. It could have been obtained from malloc(0), so failing to
    free it would be a small memory leak.
  
  MFC After:	2 weeks
  Reported by:	naddy
  PR:		ports/138320

Modified:
  head/lib/libc/stdio/getdelim.c

Modified: head/lib/libc/stdio/getdelim.c
==============================================================================
--- head/lib/libc/stdio/getdelim.c	Sun Oct  4 19:03:32 2009	(r197751)
+++ head/lib/libc/stdio/getdelim.c	Sun Oct  4 19:43:36 2009	(r197752)
@@ -120,8 +120,8 @@ getdelim(char ** __restrict linep, size_
 		goto error;
 	}
 
-	if (*linecapp == 0)
-		*linep = NULL;
+	if (*linep == NULL)
+		*linecapp = 0;
 
 	if (fp->_r <= 0 && __srefill(fp)) {
 		/* If fp is at EOF already, we just need space for the NUL. */