Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 450ff8a4: Merge change 23357 into eclair

Browse Source 
Merge commit '450ff8a48c9b78729332c99d680560b583f17e7d' into eclair-plus-aosp

* commit '450ff8a48c9b78729332c99d680560b583f17e7d':
  Fix double-free problem in EmojiFactory.
This commit is contained in:
Daisuke Miyakawa
2009-08-31 16:35:42 -07:00
committed by Android Git Automerger
parent 8b8077e427 450ff8a48c
commit 0876177961
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/jni/android_emoji_EmojiFactory.cpp
View File

@@ -197,8 +197,11 @@ static jobject android_emoji_EmojiFactory_getBitmapFromAndroidPua(
static void android_emoji_EmojiFactory_destructor( static void android_emoji_EmojiFactory_destructor(
JNIEnv* env, jobject obj, jint nativeEmojiFactory) { JNIEnv* env, jobject obj, jint nativeEmojiFactory) {
/*
// Must not delete this object!!
EmojiFactory *factory = reinterpret_cast<EmojiFactory *>(nativeEmojiFactory); EmojiFactory *factory = reinterpret_cast<EmojiFactory *>(nativeEmojiFactory);
delete factory; delete factory;
*/
} }
static jint android_emoji_EmojiFactory_getAndroidPuaFromVendorSpecificSjis( static jint android_emoji_EmojiFactory_getAndroidPuaFromVendorSpecificSjis(