Allow null jstring to C++ string conversions in release.
WebView has too many cases where apps can pass in a null java string and
have it reach native causing a crash. For now, put back the code that
returned empty string, but keep the DCHECK so that we still hit it on
bots that run with DCHECKs enabled. We'll fix WebView and have another
go at this in a later release.
This is a partial revert of https://codereview.chromium.org/1828193002
BUG=597564
Review URL: https://codereview.chromium.org/1913183002
Cr-Commit-Position: refs/heads/master@{#389166}
diff --git a/base/android/jni_string.cc b/base/android/jni_string.cc
index c24ab36a..f28f6498 100644
--- a/base/android/jni_string.cc
+++ b/base/android/jni_string.cc
@@ -25,6 +25,11 @@
void ConvertJavaStringToUTF8(JNIEnv* env, jstring str, std::string* result) {
DCHECK(str);
+ if (!str) {
+ LOG(WARNING) << "ConvertJavaStringToUTF8 called with null string.";
+ result->clear();
+ return;
+ }
const jsize length = env->GetStringLength(str);
if (!length) {
result->clear();
@@ -71,6 +76,11 @@
void ConvertJavaStringToUTF16(JNIEnv* env, jstring str, string16* result) {
DCHECK(str);
+ if (!str) {
+ LOG(WARNING) << "ConvertJavaStringToUTF16 called with null string.";
+ result->clear();
+ return;
+ }
const jsize length = env->GetStringLength(str);
if (!length) {
result->clear();
