ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Keep the still relevant part of external/icu/icu4c-ubsan.patch.1

Browse Source 
...which f247f08e37 "Upgrade to ICU 61.1" had
removed completely, in error.

Change-Id: I7239011561851333cac58e54e4e7d590b8529dbc
This commit is contained in:
Stephan Bergmann
2018-04-18 16:35:55 +02:00
parent b07e8a7e16
commit 811575c105
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
external/icu/UnpackedTarball_icu.mk
Vendored
+1
View File
@@ -27,6 +27,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-solarisgcc.patch.1 \
external/icu/icu4c-mkdir.patch.1 \
external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch.1 \
external/icu/icu4c-ubsan.patch.1 \
external/icu/icu4c-icu11100.patch.1 \
external/icu/icu4c-scriptrun.patch.1 \
external/icu/icu4c-rtti.patch.1 \
external/icu/icu4c-ubsan.patch.1
Vendored
+14
View File
@@ -0,0 +1,14 @@
diff -ur icu.org/source/common/ubidiimp.h icu/source/common/ubidiimp.h
--- icu.org/source/common/ubidiimp.h 2017-02-03 19:57:23.000000000 +0100
+++ icu/source/common/ubidiimp.h 2017-04-21 22:46:25.374651159 +0200
@@ -198,8 +198,8 @@
/* in a Run, logicalStart will get this bit set if the run level is odd */
#define INDEX_ODD_BIT (1UL<<31)
-#define MAKE_INDEX_ODD_PAIR(index, level) ((index)|((int32_t)(level)<<31))
-#define ADD_ODD_BIT_FROM_LEVEL(x, level) ((x)|=((int32_t)(level)<<31))
+#define MAKE_INDEX_ODD_PAIR(index, level) ((index)|((uint32_t)(level)<<31))
+#define ADD_ODD_BIT_FROM_LEVEL(x, level) ((x)|=((uint32_t)(level)<<31))
#define REMOVE_ODD_BIT(x) ((x)&=~INDEX_ODD_BIT)
#define GET_INDEX(x) ((x)&~INDEX_ODD_BIT)