OSDN Git Service

Fix race with Asset destruction and printing allocation stats
authorAdam Lesinski <adamlesinski@google.com>
Mon, 17 Oct 2016 20:50:56 +0000 (13:50 -0700)
committerAdam Lesinski <adamlesinski@google.com>
Tue, 18 Oct 2016 01:27:39 +0000 (01:27 +0000)
commit2582465bb437d3700b846fe66416f1c650e9345c
treedb0b6e84410b7aef271f72d5b03aa66b61f89cf9
parentc81e1f15d28711d69f576d34741ec06faea0c4de
Fix race with Asset destruction and printing allocation stats

A race could occur when printing the list of Asset allocations for
debugging purposes.

Each Asset object would insert themselves into a global linked list
on construction and remove themselves on destruction. Iterating the list
and the insertion/remove operations all acquire a global lock.

The race occurs after the Asset subclass destructor runs but before the Asset
base class destructor runs, which performs the actual removal from the list.

The vtable of the object being destroyed ends up pointing at the base Asset class'
vtable, and during the iteration of the global list, a pure virtual method is called
leading to an abort, since the wrong vtable is dereferenced.

This change moves the insertion/removal of the Asset object into the global list
to the concrete class, which adds some maintenance overhead but solves the problem.

Bug:31113965
Test: make libandroidfw_tests
Change-Id: I1a620897e5e04a8519ee247883bba0719b1fa6f3
(cherry picked from commit 0358efe4f76f42d9eea91600202a5ab0831d9cef)
include/androidfw/Asset.h
libs/androidfw/Asset.cpp
libs/androidfw/tests/Android.mk
libs/androidfw/tests/Asset_test.cpp [new file with mode: 0644]