AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[skottie] More defensive array indexing

Browse Source 
Rapidjson's array [] operator asserts the index is valid (instead of
returning a null value when out-of-range) -> we must check.

Bug: skia:7918
Change-Id: Ice4a6e6670a824da0d423da4a6f92414cd0dc252
Reviewed-on: https://skia-review.googlesource.com/126441
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>
This commit is contained in:
Florin Malita 2018-05-07 10:02:13 -04:00 committed by Skia Commit-Bot
parent c3b0822d50
commit 0ca7a88e64
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
experimental/skottie/SkottieJson.cpp
View File

@ -170,7 +170,7 @@ size_t ValueRef::size() const {
}
ValueRef ValueRef::operator[](size_t i) const {
return this->isArray() ? ValueRef(fValue->operator[](i)) : ValueRef();
return i < this->size() ? ValueRef(fValue->operator[](i)) : ValueRef();
}
ValueRef ValueRef::operator[](const char* key) const {