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

Merge "Possible leak in android_emoji_EmojiFactory_newInstance"

Browse Source
This commit is contained in:
Victoria Lease
2012-12-20 12:09:48 -08:00
committed by Gerrit Code Review
parent 62ec958865 b6ac9e50cf
commit fc56015bd3
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/jni/android_emoji_EmojiFactory.cpp
View File

@@ -3,8 +3,7 @@
#define LOG_TAG "EmojiFactory_jni"
#include <utils/Log.h>
#include <utils/String8.h>
#include <utils/String16.h>
#include <ScopedUtfChars.h>
#include "EmojiFactory.h"
#include <nativehelper/JNIHelp.h>
@@ -125,16 +124,13 @@ static jobject android_emoji_EmojiFactory_newInstance(
return NULL;
}
const jchar* jchars = env->GetStringChars(name, NULL);
jsize len = env->GetStringLength(name);
String8 str(String16(jchars, len));
ScopedUtfChars nameUtf(env, name);
EmojiFactory *factory = gCaller->TryCallGetImplementation(str.string());
EmojiFactory *factory = gCaller->TryCallGetImplementation(nameUtf.c_str());
// EmojiFactory *factory = EmojiFactory::GetImplementation(str.string());
if (NULL == factory) {
return NULL;
}
env->ReleaseStringChars(name, jchars);
return create_java_EmojiFactory(env, factory, name);
}
@@ -151,8 +147,8 @@ static jobject android_emoji_EmojiFactory_newAvailableInstance(
if (NULL == factory) {
return NULL;
}
String16 name_16(String8(factory->Name()));
jstring jname = env->NewString(name_16.string(), name_16.size());
jstring jname = env->NewStringUTF(factory->Name());
if (NULL == jname) {
return NULL;
}