commit 836515c1b5cd5eb6afec5b33407d0fd885a4ed9c
author Christopher Ferris <cferris@google.com> Fri Jul 10 17:30:45 2015 +0000
committer Christopher Ferris <cferris@google.com> Fri Jul 10 10:31:19 2015 -0700
tree 9433a80158ac07eb121a6cd1f93a479ad73f7b23
parent 3ead473fc345ea31e4943698a6f144ab31d4a3f8

Revert "Fix chunk size check."

Bug: 21633176

This reverts commit c429191e01e516d97bd501465289a351ef48d63a.

Change-Id: Idbc8dee0e5017c63654b38839bad7cc69619de56

src/chunk.c

diff --git a/src/chunk.c b/src/chunk.c
index 2e17cb2..7063410 100644
--- a/src/chunk.c
+++ b/src/chunk.c
@@ -130,9 +130,8 @@
 		node = chunk_first_fit(arena, chunks_szad, chunks_ad,
 		    alloc_size);
 	}
-	/* ANDROID fix. */
-	if (node == NULL || extent_node_size_get(node) < size) {
-	/* End ANDROID fix. */
+	if (node == NULL || (new_addr != NULL && extent_node_size_get(node) <
+	    size)) {
 		malloc_mutex_unlock(&arena->chunks_mtx);
 		return (NULL);
 	}