Skip to content

C
core
Kaydet (Commit) fcfa3990 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

external/libmwaw: Work around -fsanitize=shift 

Change-Id: Ia44ef02bc19653e2a20b2da52f5b5b377950353d
üst 8dd900b6
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 0 deletions
external/libmwaw/UnpackedTarball_libmwaw.mk
Dosyayı görüntüle @ fcfa3990
...@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,1)) ...@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,1))
$(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\ $(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
external/libmwaw/0001-ClarisWorks-AppleWorks-spreadsheet-do-not-remove-fir.patch \ external/libmwaw/0001-ClarisWorks-AppleWorks-spreadsheet-do-not-remove-fir.patch \
external/libmwaw/0002-ClarisWors-AppleWorks-spreadsheet-Oops-correct-of-a-.patch \ external/libmwaw/0002-ClarisWors-AppleWorks-spreadsheet-Oops-correct-of-a-.patch \
external/libmwaw/ubsan.patch.0 \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
external/libmwaw/ubsan.patch.0 0 → 100644
Dosyayı görüntüle @ fcfa3990
--- src/lib/WingzParser.cxx
+++ src/lib/WingzParser.cxx
@@ -1120,7 +1120,7 @@
MWAWColor colors[4];
for (int i=0; i<4; ++i) { // font, back, unknown,font color
val=(int) input->readULong(4);
- int col=((val>>16)&0xFF)|(val&0xFF00)|((val<<16)&0xFFFFFF);
+ int col=((val>>16)&0xFF)|(val&0xFF00)|((val&0xFF)<<16);
int high=(val>>24);
colors[i]=MWAWColor(uint32_t(col)|0xFF000000);
switch (i) {
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment