summaryrefslogtreecommitdiffstats
path: root/core/jni/android_emoji_EmojiFactory.cpp
diff options
context:
space:
mode:
authorDaisuke Miyakawa <dmiyakawa@google.com>2009-09-01 08:32:24 +0900
committerDaisuke Miyakawa <dmiyakawa@google.com>2009-09-01 08:32:24 +0900
commitc81c43991c3522451dbea1743a33d8f7e5446979 (patch)
treea78140a8207de6266e7bd5561fdc1b5e39b6caa3 /core/jni/android_emoji_EmojiFactory.cpp
parentf75c94f7a9ff6fbc898162d3c9d94e8ac41dd778 (diff)
downloadframeworks_base-c81c43991c3522451dbea1743a33d8f7e5446979.zip
frameworks_base-c81c43991c3522451dbea1743a33d8f7e5446979.tar.gz
frameworks_base-c81c43991c3522451dbea1743a33d8f7e5446979.tar.bz2
Fix double-free problem in EmojiFactory.
Diffstat (limited to 'core/jni/android_emoji_EmojiFactory.cpp')
-rw-r--r--core/jni/android_emoji_EmojiFactory.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/jni/android_emoji_EmojiFactory.cpp b/core/jni/android_emoji_EmojiFactory.cpp
index 7d6e24f..4c213a3 100644
--- a/core/jni/android_emoji_EmojiFactory.cpp
+++ b/core/jni/android_emoji_EmojiFactory.cpp
@@ -197,8 +197,11 @@ static jobject android_emoji_EmojiFactory_getBitmapFromAndroidPua(
static void android_emoji_EmojiFactory_destructor(
JNIEnv* env, jobject obj, jint nativeEmojiFactory) {
+ /*
+ // Must not delete this object!!
EmojiFactory *factory = reinterpret_cast<EmojiFactory *>(nativeEmojiFactory);
delete factory;
+ */
}
static jint android_emoji_EmojiFactory_getAndroidPuaFromVendorSpecificSjis(