diff options
| author | Colin Cross <ccross@android.com> | 2017-06-06 03:54:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-06 03:54:42 +0000 |
| commit | db883a13baacfe74a4ed035af26a0f99ba9321e7 (patch) | |
| tree | 44865f842035b9548435aedbd895817eacd2b7c2 /cpp/src/sfntly/data/byte_array.cc | |
| parent | 81c126c6c590699cab67fe2c8814478b5c3a0061 (diff) | |
| parent | 3bb233dbba325674fd1f44d462554b4c5c264463 (diff) | |
| download | sfntly-db883a13baacfe74a4ed035af26a0f99ba9321e7.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into master am: d7c3ad1d95 am: fd76129cde am: 3d3aab44bf am: ad302cbfd8 am: 31db13c42a am: 47b38c7df8 am: 1f8dca48cb am: 959c8f3447 am: e070d6c91d am: a47999b814 am: 193346642e am: 7b02e08975
am: 3bb233dbba
Change-Id: I8be573ef10c65f90d33ae668ec51feba98aa81d7
Diffstat (limited to 'cpp/src/sfntly/data/byte_array.cc')
| -rw-r--r-- | cpp/src/sfntly/data/byte_array.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cpp/src/sfntly/data/byte_array.cc b/cpp/src/sfntly/data/byte_array.cc index 915a40c..57f9eed 100644 --- a/cpp/src/sfntly/data/byte_array.cc +++ b/cpp/src/sfntly/data/byte_array.cc @@ -35,6 +35,8 @@ int32_t ByteArray::SetFilledLength(int32_t filled_length) { } int32_t ByteArray::Get(int32_t index) { + if (index < 0 || index >= Length()) + return -1; return InternalGet(index) & 0xff; } |