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

Merge "Pass MUTF-8 paths to open(2) instead of UTF-8."

Browse Source
This commit is contained in:
Narayan Kamath
2015-06-08 15:14:31 +00:00
committed by Gerrit Code Review
parent 3a5c054ac3 d415303c4d
commit f5b7778e55
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/jni/android_os_Parcel.cpp
View File

@@ -449,15 +449,11 @@ static jobject android_os_Parcel_openFileDescriptor(JNIEnv* env, jclass clazz,
jniThrowNullPointerException(env, NULL); jniThrowNullPointerException(env, NULL);
return NULL; return NULL;
} }
const jchar* str = env->GetStringCritical(name, 0); ScopedUtfChars name8(env, name);
if (str == NULL) { if (name8.c_str() == NULL) {
// Whatever, whatever.
jniThrowException(env, "java/lang/IllegalStateException", NULL);
return NULL; return NULL;
} }
String8 name8(reinterpret_cast<const char16_t*>(str),
env->GetStringLength(name));
env->ReleaseStringCritical(name, str);
int flags=0; int flags=0;
switch (mode&0x30000000) { switch (mode&0x30000000) {
case 0: case 0:
@@ -480,7 +476,7 @@ static jobject android_os_Parcel_openFileDescriptor(JNIEnv* env, jclass clazz,
if (mode&0x00000001) realMode |= S_IROTH; if (mode&0x00000001) realMode |= S_IROTH;
if (mode&0x00000002) realMode |= S_IWOTH; if (mode&0x00000002) realMode |= S_IWOTH;
int fd = open(name8.string(), flags, realMode); int fd = open(name8.c_str(), flags, realMode);
if (fd < 0) { if (fd < 0) {
jniThrowException(env, "java/io/FileNotFoundException", strerror(errno)); jniThrowException(env, "java/io/FileNotFoundException", strerror(errno));
return NULL; return NULL;