base/android/jni_string.cc - Issue 10916281: Make ConvertJavaToUTF functions more robusts.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/android/jni_string.cc

Issue 10916281: Make ConvertJavaToUTF functions more robusts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: base/android/jni_string.cc

diff --git a/base/android/jni_string.cc b/base/android/jni_string.cc

index c8a90ca9e1012c9d97ac0e822350081c6937fd35..b830ddbb90823c5ae45c794d5c217baed92098df 100644

--- a/base/android/jni_string.cc

+++ b/base/android/jni_string.cc

@@ -48,6 +48,10 @@ ScopedJavaLocalRef<jstring> ConvertUTF8ToJavaString(

}

string16 ConvertJavaStringToUTF16(JNIEnv* env, jstring str) {

+ if (!str) {

+ LOG(WARNING) << " ConvertJavaStringToUTF16 called with null string.";

+ return string16();

+ }

const jchar* chars = env->GetStringChars(str, NULL);

DCHECK(chars);

// GetStringChars isn't required to NULL-terminate the strings

« no previous file with comments | « no previous file | no next file » | no next file with comments »