tag 83786972f77dd0cd3692c15ba466f6dcbc66c9c5
tagger The Android Open Source Project <initial-contribution@android.com> Mon Jun 06 13:27:09 2016 -0700
object c7682d72e8eeca87831dd36e09888ecd22a25f17

Android N Preview 3 (NPD35K)

commit c7682d72e8eeca87831dd36e09888ecd22a25f17
author Jason Evans <je@fb.com> Wed Mar 30 18:36:04 2016 -0700
committer Christopher Ferris <cferris@google.com> Thu May 05 15:52:07 2016 -0700
tree 41cbb603d1e1602b2334b1d050052b12e61c85c0
parent b32837faaa5b0b0f25652c389c4503304fe9fac8

Fix potential chunk leaks.

Move chunk_dalloc_arena()'s implementation into chunk_dalloc_wrapper(),
so that if the dalloc hook fails, proper decommit/purge/retain cascading
occurs.  This fixes three potential chunk leaks on OOM paths, one during
dss-based chunk allocation, one during chunk header commit (currently
relevant only on Windows), and one during rtree write (e.g. if rtree
node allocation fails).

Merge chunk_purge_arena() into chunk_purge_default() (refactor, no
change to functionality).

Bug: 28590121

(cherry picked from commit 1ae9287a1aec534fa0a805a717f1c4e058ae8433)

Change-Id: Ia21292ab25c65bb7a8aa44077c86545789a9e786