mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid undefined left shift of negative value

Browse Source 
Change-Id: If4e7f6fca3f6afbbeaa79e00706be08d674e2aeb
This commit is contained in:
Stephan Bergmann
2014-05-28 08:52:52 +02:00
parent 6e7986a2fc
commit ce583af689
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
i18nutil/source/utility/casefolding.cxx
View File

@@ -79,12 +79,14 @@ Mapping& casefolding::getConditionalValue(const sal_Unicode* str, sal_Int32 pos,
Mapping& casefolding::getValue(const sal_Unicode* str, sal_Int32 pos, sal_Int32 len, Locale& aLocale, sal_uInt8 nMappingType) throw (RuntimeException) Mapping& casefolding::getValue(const sal_Unicode* str, sal_Int32 pos, sal_Int32 len, Locale& aLocale, sal_uInt8 nMappingType) throw (RuntimeException)
{ {
static Mapping dummy = { 0, 1, { 0, 0, 0 } }; static Mapping dummy = { 0, 1, { 0, 0, 0 } };
sal_Int16 address = CaseMappingIndex[str[pos] >> 8] << 8; sal_Int16 address = CaseMappingIndex[str[pos] >> 8];
dummy.map[0] = str[pos]; dummy.map[0] = str[pos];
if (address >= 0 && (CaseMappingValue[address += (str[pos] & 0xFF)].type & nMappingType)) { if (address >= 0) {
address = (address << 8) + (str[pos] & 0xFF);
if (CaseMappingValue[address].type & nMappingType) {
sal_uInt8 type = CaseMappingValue[address].type; sal_uInt8 type = CaseMappingValue[address].type;
if (type & ValueTypeNotValue) { if (type & ValueTypeNotValue) {
if (CaseMappingValue[address].value == 0) if (CaseMappingValue[address].value == 0)
@@ -105,7 +107,8 @@ Mapping& casefolding::getValue(const sal_Unicode* str, sal_Int32 pos, sal_Int32
} else } else
dummy.map[0] = CaseMappingValue[address].value; dummy.map[0] = CaseMappingValue[address].value;
} }
return dummy; }
return dummy;
} }
inline bool SAL_CALL inline bool SAL_CALL