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

Unified Diff: mojo/public/js/codec.js

Issue 795593004: Update mojo sdk to rev cc531b32182099a5a034a99daff35ed5d38a61c8 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More workarounds for MSVC Created 6 years 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/js/codec.js
diff --git a/mojo/public/js/codec.js b/mojo/public/js/codec.js
index ea4273a32ffd67e1398a1970a67ed1848f402e3f..68d5dba75f2f581f657f4b0295dbafc61f2e6f93 100644
--- a/mojo/public/js/codec.js
+++ b/mojo/public/js/codec.js
@@ -8,6 +8,9 @@ define("mojo/public/js/codec", [
], function(unicode, buffer) {
var kErrorUnsigned = "Passing negative value to unsigned";
+ var kErrorArray = "Passing non Array for array type";
+ var kErrorString = "Passing non String for string type";
+ var kErrorMap = "Passing non Map for map type";
// Memory -------------------------------------------------------------------
@@ -352,7 +355,11 @@ define("mojo/public/js/codec", [
this.encodePointer(val);
return;
}
+
var numberOfElements = val.length;
+ if (!Number.isSafeInteger(numberOfElements) || numberOfElements < 0)
+ throw new Error(kErrorArray);
+
var encodedSize = kArrayHeaderSize + ((cls === PackedBool) ?
Math.ceil(numberOfElements / 8) : cls.encodedSize * numberOfElements);
var encoder = this.createAndEncodeEncoder(encodedSize);
@@ -365,6 +372,10 @@ define("mojo/public/js/codec", [
this.encodePointer(val);
return;
}
+ // Only accepts string primivites, not String Objects like new String("foo")
+ if (typeof(val) !== "string") {
+ throw new Error(kErrorString);
+ }
var encodedSize = kArrayHeaderSize + unicode.utf8Length(val);
var encoder = this.createAndEncodeEncoder(encodedSize);
encoder.encodeString(val);
@@ -390,6 +401,9 @@ define("mojo/public/js/codec", [
this.encodePointer(val);
return;
}
+ if (!(val instanceof Map)) {
+ throw new Error(kErrorMap);
+ }
var encodedSize = kStructHeaderSize + kMapStructPayloadSize;
var encoder = this.createAndEncodeEncoder(encodedSize);
encoder.encodeMap(keyClass, valueClass, val);
« no previous file with comments | « mojo/public/java/system/src/org/chromium/mojo/system/InvalidHandle.java ('k') | mojo/public/js/codec_unittests.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698