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.
This commit is contained in:
Kenny Root
2009-08-21 15:23:45 -05:00
committed by Kenny Root
parent 8280c2b15f
commit 88721afe2f

View File

@@ -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);