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

Unified Diff: runtime/vm/object.cc

Issue 11447009: - Do not read past the end of the utf32_array. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 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
« no previous file with comments | « no previous file | runtime/vm/object_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/object.cc
===================================================================
--- runtime/vm/object.cc (revision 15726)
+++ runtime/vm/object.cc (working copy)
@@ -9996,16 +9996,17 @@
bool String::Equals(const int32_t* utf32_array, intptr_t len) const {
CodePointIterator it(*this);
intptr_t i = 0;
- while (it.Next()) {
- if (it.Current() != static_cast<int32_t>(utf32_array[i])) {
+ bool has_more = it.Next();
+ while (has_more && (i < len)) {
+ if ((it.Current() != static_cast<int32_t>(utf32_array[i]))) {
return false;
}
+ // Advance both streams forward.
++i;
+ has_more = it.Next();
}
- if (i != len) {
- return false;
- }
- return true;
+ // Strings are only true iff we reached the end in both streams.
+ return (i == len) && !has_more;
}
« no previous file with comments | « no previous file | runtime/vm/object_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698