diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-01-28 17:51:21 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-01-28 17:56:18 +0100 |
| commit | ed874d2eab1a6b1146f411a5a83cc790d3226f10 (patch) | |
| tree | 994320f548c4299d9795c9f384b8db03cc540e09 /external/lcms2 | |
| parent | fix crash in vcldemo (diff) | |
| download | core-ed874d2eab1a6b1146f411a5a83cc790d3226f10.tar.gz core-ed874d2eab1a6b1146f411a5a83cc790d3226f10.zip | |
external/lcms2: Work around -fsanitize=alignment
Change-Id: I57c49172fa5bb19968bf217285d0cd9222cc3530
Diffstat (limited to 'external/lcms2')
| -rw-r--r-- | external/lcms2/ubsan.patch.0 | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/external/lcms2/ubsan.patch.0 b/external/lcms2/ubsan.patch.0 index 2eafcad39696..0b64484c6eab 100644 --- a/external/lcms2/ubsan.patch.0 +++ b/external/lcms2/ubsan.patch.0 @@ -1,3 +1,14 @@ +--- src/cmsnamed.c ++++ src/cmsnamed.c +@@ -221,7 +221,7 @@ + cmsBool CMSEXPORT cmsMLUsetWide(cmsMLU* mlu, const char Language[3], const char Country[3], const wchar_t* WideString) + { + cmsUInt16Number Lang = _cmsAdjustEndianess16(*(cmsUInt16Number*) Language); +- cmsUInt16Number Cntry = _cmsAdjustEndianess16(*(cmsUInt16Number*) Country); ++ cmsUInt16Number Cntry = Country[0] | ((cmsUInt16Number) Country[1]) << 8; + cmsUInt32Number len; + + if (mlu == NULL) return FALSE; --- src/lcms2_internal.h +++ src/lcms2_internal.h @@ -93,7 +93,7 @@ |