diff options
| author | Kenny Root <kenny@the-b.org> | 2009-08-21 15:23:45 -0500 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2009-12-04 13:40:54 -0800 |
| commit | 88721afe2f161ae23de952b790aaa8b4d3560ba8 (patch) | |
| tree | 0f1cc4e39be75305bb9007c6d9b3cd09e23ede09 /tools/aapt/StringPool.cpp | |
| parent | 8280c2b15f6875b2d387c05df23d264864eb9cd5 (diff) | |
Fix bitmask in aapt's StringPool length construction
The StringPool indicates the length of a string with a 16-bit
integer. If the length of the string is greater than 0x7FFF,
it splits it into two 16-bit integers with the first one
having the high bit set.
The length calculation has a small bug that masks off the
19 bits instead of the first 15 bits as intended.
Diffstat (limited to 'tools/aapt/StringPool.cpp')
| -rw-r--r-- | tools/aapt/StringPool.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/StringPool.cpp b/tools/aapt/StringPool.cpp index 878d3b1fea7e..715170aedfeb 100644 --- a/tools/aapt/StringPool.cpp +++ b/tools/aapt/StringPool.cpp @@ -228,7 +228,7 @@ status_t StringPool::writeStringBlock(const sp<AaptFile>& pool) } dat += (preSize+strPos)/sizeof(uint16_t); if (lenSize > sizeof(uint16_t)) { - *dat = htods(0x8000 | ((strSize>>16)&0x7ffff)); + *dat = htods(0x8000 | ((strSize>>16)&0x7fff)); dat++; } *dat++ = htods(strSize); |