diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-08-06 16:50:11 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-08-06 16:50:11 +0200 |
| commit | 83e5c3e93d9a6f306973d25f6e0426b5d0d06d07 (patch) | |
| tree | 2207e6afefd01e840afa23c0bc5a31c961876bd5 /external/nss | |
| parent | 46e03df0a7471a887e7cf403765b4de3582d9a1e (diff) | |
left shift of 4276994303 by 32 places cannot be represented in type 'long'
Change-Id: Ie9ddc5a42116720e0602d7fb38360f01b71df69c
Diffstat (limited to 'external/nss')
| -rw-r--r-- | external/nss/UnpackedTarball_nss.mk | 3 | ||||
| -rw-r--r-- | external/nss/ubsan.patch.0 | 13 |
2 files changed, 15 insertions, 1 deletions
diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index 11839c4e624a..0f166c9f9cbe 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -22,7 +22,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\ $(if $(filter WNTGCC,$(OS)$(COM)),external/nss/nspr-4.9-build.patch.3 \ external/nss/nss-3.13.3-build.patch.3 \ external/nss/nss.mingw.patch.3) \ - external/nss/nspr-build-config.patch \ + external/nss/nspr-build-config.patch \ + external/nss/ubsan.patch.0 \ )) # nss-pem is only needed for internal curl to read the NSS CA database diff --git a/external/nss/ubsan.patch.0 b/external/nss/ubsan.patch.0 new file mode 100644 index 000000000000..298ca40d5c09 --- /dev/null +++ b/external/nss/ubsan.patch.0 @@ -0,0 +1,13 @@ +--- nss/lib/libpkix/pkix/util/pkix_tools.h ++++ nss/lib/libpkix/pkix/util/pkix_tools.h +@@ -1458,8 +1458,8 @@ + + extern PRLogModuleInfo *pkixLog; + +-#define PKIX_MAGIC_HEADER LL_INIT(0xFEEDC0FF, 0xEEFACADE) +-#define PKIX_MAGIC_HEADER_DESTROYED LL_INIT(0xBAADF00D, 0xDEADBEEF) ++#define PKIX_MAGIC_HEADER LL_INIT(0xFEEDC0FFU, 0xEEFACADEU) ++#define PKIX_MAGIC_HEADER_DESTROYED LL_INIT(0xBAADF00DU, 0xDEADBEEFU) + + /* see source file for function documentation */ + |