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

external/icu: Some trivial -fsanitize=undefined patches

Browse Source 
Change-Id: I99c62b08b84d2d8afafd391257ab7b8b2d887fac
This commit is contained in:
Stephan Bergmann
2014-04-16 17:47:30 +02:00
parent 7ec515a716
commit 421c78e05f
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
external/icu/UnpackedTarball_icu.mk vendored
View File

@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-mkdir.patch \
external/icu/icu4c-buffer-overflow.patch \
external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch \
external/icu/icu4c-ubsan.patch.0 \
))
# vim: set noet sw=4 ts=4:

22
external/icu/icu4c-ubsan.patch.0 vendored Normal file
View File

@@ -0,0 +1,22 @@
--- source/common/ustring.cpp
+++ source/common/ustring.cpp
@@ -1486,7 +1486,7 @@
*/
#define STRING_HASH(TYPE, STR, STRLEN, DEREF) \
- int32_t hash = 0; \
+ uint32_t hash = 0; \
const TYPE *p = (const TYPE*) STR; \
if (p != NULL) { \
int32_t len = (int32_t)(STRLEN); \
--- source/i18n/ucol_tok.cpp
+++ source/i18n/ucol_tok.cpp
@@ -48,7 +48,7 @@
static int32_t U_CALLCONV
uhash_hashTokens(const UHashTok k)
{
- int32_t hash = 0;
+ uint32_t hash = 0;
//uint32_t key = (uint32_t)k.integer;
UColToken *key = (UColToken *)k.pointer;
if (key != 0) {