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

Unified Diff: runtime/vm/object.cc

Issue 1149943009: Shrink some fields and add some bounds checks. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 6 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
« no previous file with comments | « runtime/vm/object.h ('k') | runtime/vm/raw_object.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/object.cc
diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
index d95d307668ba37b42e9980ae11f4ba5dfb406bae..31a8bfdc1beab180c1317f8e71140bb438589c9d 100644
--- a/runtime/vm/object.cc
+++ b/runtime/vm/object.cc
@@ -8698,6 +8698,25 @@ void LibraryPrefixIterator::Advance() {
}
+static void ReportTooManyImports(const Library& lib) {
+ String& url = String::Handle(lib.url());
siva 2015/06/09 01:29:02 const String& url
rmacnak 2015/06/09 17:47:11 Done.
+ Report::MessageF(Report::kError,
+ Script::Handle(lib.LookupScript(url)),
+ Scanner::kNoSourcePos,
+ "too many imports in library '%s'",
+ url.ToCString());
+ UNREACHABLE();
+}
+
+
+void Library::set_num_imports(intptr_t value) const {
+ if (!Utils::IsUint(16, value)) {
+ ReportTooManyImports(*this);
+ }
+ StoreNonPointer(&raw_ptr()->num_imports_, value);
+}
+
+
void Library::SetName(const String& name) const {
// Only set name once.
ASSERT(!Loaded());
@@ -10294,6 +10313,9 @@ void LibraryPrefix::set_imports(const Array& value) const {
void LibraryPrefix::set_num_imports(intptr_t value) const {
+ if (!Utils::IsUint(16, value)) {
+ ReportTooManyImports(Library::Handle(importer()));
+ }
StoreNonPointer(&raw_ptr()->num_imports_, value);
}
@@ -15568,6 +15590,7 @@ void TypeParameter::set_parameterized_class(const Class& value) const {
void TypeParameter::set_index(intptr_t value) const {
ASSERT(value >= 0);
+ ASSERT(Utils::IsInt(16, value));
StoreNonPointer(&raw_ptr()->index_, value);
}
« no previous file with comments | « runtime/vm/object.h ('k') | runtime/vm/raw_object.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698