Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(46)

Unified Diff: base/android/jni_string.cc

Issue 1828193002: DCHECK that jstring to C++ string conversions don't pass in null. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix all the things Created 4 years, 9 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:
View side-by-side diff with in-line comments
Download patch
Index: base/android/jni_string.cc
diff --git a/base/android/jni_string.cc b/base/android/jni_string.cc
index 0bc36597d75c34adf2b1fa5fdff55aa329329fe3..c24ab36ab5ec35795478e5ca659778fc9ed563f7 100644
--- a/base/android/jni_string.cc
+++ b/base/android/jni_string.cc
@@ -24,11 +24,7 @@ namespace base {
namespace android {
void ConvertJavaStringToUTF8(JNIEnv* env, jstring str, std::string* result) {
- if (!str) {
- LOG(WARNING) << "ConvertJavaStringToUTF8 called with null string.";
- result->clear();
- return;
- }
+ DCHECK(str);
const jsize length = env->GetStringLength(str);
if (!length) {
result->clear();
@@ -74,11 +70,7 @@ ScopedJavaLocalRef<jstring> ConvertUTF8ToJavaString(
}
void ConvertJavaStringToUTF16(JNIEnv* env, jstring str, string16* result) {
- if (!str) {
- LOG(WARNING) << "ConvertJavaStringToUTF16 called with null string.";
- result->clear();
- return;
- }
+ DCHECK(str);
const jsize length = env->GetStringLength(str);
if (!length) {
result->clear();

Powered by Google App Engine
This is Rietveld 408576698