Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 24 Sep 2019 06:23:39 +0000 (UTC)
From:      Konstantin Belousov <kib@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r352646 - stable/11/contrib/jemalloc/src
Message-ID:  <201909240623.x8O6NdDt020741@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kib
Date: Tue Sep 24 06:23:38 2019
New Revision: 352646
URL: https://svnweb.freebsd.org/changeset/base/352646

Log:
  MFC r352456:
  realloc(x, 0) should not return NULL.
  
  PR:	240456

Modified:
  stable/11/contrib/jemalloc/src/jemalloc.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/contrib/jemalloc/src/jemalloc.c
==============================================================================
--- stable/11/contrib/jemalloc/src/jemalloc.c	Tue Sep 24 06:21:48 2019	(r352645)
+++ stable/11/contrib/jemalloc/src/jemalloc.c	Tue Sep 24 06:23:38 2019	(r352646)
@@ -1853,15 +1853,6 @@ je_realloc(void *ptr, size_t size)
 	UNUSED size_t old_rzsize JEMALLOC_CC_SILENCE_INIT(0);
 
 	if (unlikely(size == 0)) {
-		if (ptr != NULL) {
-			tsd_t *tsd;
-
-			/* realloc(ptr, 0) is equivalent to free(ptr). */
-			UTRACE(ptr, 0, 0);
-			tsd = tsd_fetch();
-			ifree(tsd, ptr, tcache_get(tsd, false), true);
-			return (NULL);
-		}
 		size = 1;
 	}
 



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