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

Unified Diff: mojo/public/cpp/bindings/lib/string_serialization.cc

Issue 486313004: Mojo cpp bindings: More clear checks for array num_bytes and num_elements. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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: mojo/public/cpp/bindings/lib/string_serialization.cc
diff --git a/mojo/public/cpp/bindings/lib/string_serialization.cc b/mojo/public/cpp/bindings/lib/string_serialization.cc
index 0044b1b9cff67a4523a60e69c2719546c18eb60c..10d09e23a91796029782dd15bf40823b8fd638c2 100644
--- a/mojo/public/cpp/bindings/lib/string_serialization.cc
+++ b/mojo/public/cpp/bindings/lib/string_serialization.cc
@@ -19,7 +19,8 @@ void Serialize_(const String& input, internal::Buffer* buf,
if (input) {
internal::String_Data* result =
internal::String_Data::New(input.size(), buf);
- memcpy(result->storage(), input.data(), input.size());
+ if (result)
+ memcpy(result->storage(), input.data(), input.size());
*output = result;
} else {
*output = NULL;

Powered by Google App Engine
This is Rietveld 408576698