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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/gcm_driver/gcm_driver_android.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
« chrome/browser/ui/android/context_menu_helper.cc ('K') | « chrome/browser/ui/android/context_menu_helper.cc ('k') | ui/android/java/src/org/chromium/ui/base/LocalizationUtils.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/gcm_driver/gcm_driver_android.cc
diff --git a/components/gcm_driver/gcm_driver_android.cc b/components/gcm_driver/gcm_driver_android.cc
index 7845bd9922cdda1cd9686681437aa3ce61de12a3..21bcfa02e3e9ef80bcaac00e67ac3b62e827a43a 100644
--- a/components/gcm_driver/gcm_driver_android.cc
+++ b/components/gcm_driver/gcm_driver_android.cc
@@ -84,7 +84,9 @@ void GCMDriverAndroid::OnMessageReceived(
IncomingMessage message;
message.sender_id = ConvertJavaStringToUTF8(env, j_sender_id);
- message.collapse_key = ConvertJavaStringToUTF8(env, j_collapse_key);
+ if (!j_collapse_key.is_null())
+ ConvertJavaStringToUTF8(env, j_collapse_key, &message.collapse_key);
+
// Expand j_data_keys_and_values from array to map.
std::vector<std::string> data_keys_and_values;
AppendJavaStringArrayToStringVector(env,
« chrome/browser/ui/android/context_menu_helper.cc ('K') | « chrome/browser/ui/android/context_menu_helper.cc ('k') | ui/android/java/src/org/chromium/ui/base/LocalizationUtils.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698