commit f616538a7f20e82157587efa026cedc3b9944542
author WenHan Gu <Wenhan.gu@mediatek.com> Tue Mar 12 21:02:25 2013 +0800
committer WenHan Gu <Wenhan.gu@mediatek.com> Tue Mar 12 21:08:07 2013 +0800
tree 7cd6d1bfa9ffb4bb914a9d27eaa19465d8ab038b
parent 3fb3d58dd29ea2300583e9f02aa19882fc509286

[Bug-fix] Remove redundant free on exception object.

__cxa_decrement_exception_refcount should not call exceptionDestructor()
directly, since __cxa_free_exception will do that.

Change-Id: I6ccfd66d21e08abbba15c704edef980a0cb769fc
Signed-off-by: WenHan Gu <Wenhan.gu@mediatek.com>

sources/cxx-stl/gabi++/src/cxxabi.cc

diff --git a/sources/cxx-stl/gabi++/src/cxxabi.cc b/sources/cxx-stl/gabi++/src/cxxabi.cc
index b5f1928..1a51224 100644
--- a/sources/cxx-stl/gabi++/src/cxxabi.cc
+++ b/sources/cxx-stl/gabi++/src/cxxabi.cc
@@ -282,11 +282,8 @@
     {
       __cxa_exception* header =
           reinterpret_cast<__cxa_exception*>(exceptionObject)-1;
-      if (__sync_sub_and_fetch(&header->referenceCount, 1) == 0) {
-        if (header->exceptionDestructor)
-          header->exceptionDestructor(exceptionObject);
+      if (__sync_sub_and_fetch(&header->referenceCount, 1) == 0)
         __cxa_free_exception(exceptionObject);
-      }
     }
   }