Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 5 Feb 2015 23:02:43 +0000 (UTC)
From:      "Pedro F. Giffuni" <pfg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r278301 - head/lib/libc/stdlib
Message-ID:  <201502052302.t15N2hU0008783@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pfg
Date: Thu Feb  5 23:02:43 2015
New Revision: 278301
URL: https://svnweb.freebsd.org/changeset/base/278301

Log:
  tdelete(3): don't delete the node we are about to return.
  
  CID:		272528
  Obtained from:	NetBSD (CVS rev. 1.4)
  MFC after:	2 weeks

Modified:
  head/lib/libc/stdlib/tdelete.c

Modified: head/lib/libc/stdlib/tdelete.c
==============================================================================
--- head/lib/libc/stdlib/tdelete.c	Thu Feb  5 22:54:31 2015	(r278300)
+++ head/lib/libc/stdlib/tdelete.c	Thu Feb  5 23:02:43 2015	(r278301)
@@ -65,7 +65,8 @@ tdelete(const void * __restrict vkey, vo
 			q->rlink = (*rootp)->rlink;
 		}
 	}
-	free(*rootp);				/* D4: Free node */
+	if (p != *rootp)
+		free(*rootp);			/* D4: Free node */
 	*rootp = q;				/* link parent to new node */
 	return p;
 }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502052302.t15N2hU0008783>