| commit | 80094e39f90801c44cd80ab0f98df505828ea1f3 | [log] [tgz] |
|---|---|---|
| author | Ryan Mitchell <rtmitchell@google.com> | Mon Nov 16 23:08:18 2020 +0000 |
| committer | Ryan Mitchell <rtmitchell@google.com> | Tue Dec 08 16:58:12 2020 +0000 |
| tree | e70d5241691a509ce9cf774dc39ce85932fdd1d2 | |
| parent | ec7e7f5622e3444a3003db20ddfd8f5745971fa7 [diff] [blame] |
Revert^2 "libandroidfw hardening for IncFs" 55ef6167a2c235bd88c7216238b2001b46795b79 Change-Id: I02d4890d181655dfd0a14c188468db512559d27b Merged-In: I02d4890d181655dfd0a14c188468db512559d27b
diff --git a/libs/androidfw/tests/CommonHelpers.cpp b/libs/androidfw/tests/CommonHelpers.cpp index faa5350..3396729 100644 --- a/libs/androidfw/tests/CommonHelpers.cpp +++ b/libs/androidfw/tests/CommonHelpers.cpp
@@ -58,8 +58,9 @@ } std::string GetStringFromPool(const ResStringPool* pool, uint32_t idx) { - String8 str = pool->string8ObjectAt(idx); - return std::string(str.string(), str.length()); + auto str = pool->string8ObjectAt(idx); + CHECK(str.has_value()) << "failed to find string entry"; + return std::string(str->string(), str->length()); } } // namespace android