diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-04-04 18:35:43 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-04-04 18:35:43 -0700 |
| commit | 03b15598c6e1e9fb37d5ef6b1343b0cbe77e80be (patch) | |
| tree | 8ebbef3dc99cc3360f0ac74bccfcf9a077efc286 /libs/minikin/SparseBitSet.cpp | |
| parent | 91780b00a06b00b2783809f66463edbadff612c1 (diff) | |
| parent | f4785aa1947b8d22d5b19559ef1ca526d98e0e73 (diff) | |
| download | android_frameworks_minikin-stable/cm-12.1-YOG4P.tar.gz android_frameworks_minikin-stable/cm-12.1-YOG4P.tar.bz2 android_frameworks_minikin-stable/cm-12.1-YOG4P.zip | |
Merge tag 'android-5.1.1_r37' into HEADstable/cm-12.1-YOG4P
Ticket: CYNGNOS-2213
Android 5.1.1 release 37
Change-Id: Icae6ceac9644997eca5a91ad4d5a0c7c869fd472
Diffstat (limited to 'libs/minikin/SparseBitSet.cpp')
| -rw-r--r-- | libs/minikin/SparseBitSet.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/minikin/SparseBitSet.cpp b/libs/minikin/SparseBitSet.cpp index 7acb7ba..2265ff2 100644 --- a/libs/minikin/SparseBitSet.cpp +++ b/libs/minikin/SparseBitSet.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ +#include <cutils/log.h> #include <stddef.h> #include <string.h> #include <minikin/SparseBitSet.h> @@ -71,6 +72,7 @@ void SparseBitSet::initFromRanges(const uint32_t* ranges, size_t nRanges) { for (size_t i = 0; i < nRanges; i++) { uint32_t start = ranges[i * 2]; uint32_t end = ranges[i * 2 + 1]; + LOG_ALWAYS_FATAL_IF(end < start); // make sure range size is nonnegative uint32_t startPage = start >> kLogValuesPerPage; uint32_t endPage = (end - 1) >> kLogValuesPerPage; if (startPage >= nonzeroPageEnd) { |