diff options
| -rw-r--r-- | distro-configs/Jenkins/Linux_ubsan_master.conf | 1 | ||||
| -rw-r--r-- | external/curl/UnpackedTarball_curl.mk | 6 | ||||
| -rw-r--r-- | external/curl/asan-poison-nsspem.patch.0 | 11 |
3 files changed, 17 insertions, 1 deletions
diff --git a/distro-configs/Jenkins/Linux_ubsan_master.conf b/distro-configs/Jenkins/Linux_ubsan_master.conf index d01bb152487a..bfc7465d50ff 100644 --- a/distro-configs/Jenkins/Linux_ubsan_master.conf +++ b/distro-configs/Jenkins/Linux_ubsan_master.conf @@ -23,7 +23,6 @@ --without-system-libxml --without-system-zlib --with-system-cairo ---with-system-nss --disable-compiler-plugins --disable-gtk3 --with-jdk-home=/etc/alternatives/java_sdk_11 diff --git a/external/curl/UnpackedTarball_curl.mk b/external/curl/UnpackedTarball_curl.mk index 73dca5ed219c..3dada60eac8e 100644 --- a/external/curl/UnpackedTarball_curl.mk +++ b/external/curl/UnpackedTarball_curl.mk @@ -41,4 +41,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,curl, \ )) endif +ifneq ($(filter -fsanitize=%,$(CC)),) +$(eval $(call gb_UnpackedTarball_add_patches,curl, \ + external/curl/asan-poison-nsspem.patch.0 \ +)) +endif + # vim: set noet sw=4 ts=4: diff --git a/external/curl/asan-poison-nsspem.patch.0 b/external/curl/asan-poison-nsspem.patch.0 new file mode 100644 index 000000000000..7c4ae6e7d1ad --- /dev/null +++ b/external/curl/asan-poison-nsspem.patch.0 @@ -0,0 +1,11 @@ +--- lib/vtls/nss.c ++++ lib/vtls/nss.c +@@ -1891,7 +1891,7 @@ + + PK11_SetPasswordFunc(nss_get_password); + +- result = nss_load_module(&pem_module, pem_library, "PEM"); ++ result = CURLE_FAILED_INIT; + PR_Unlock(nss_initlock); + if(result == CURLE_FAILED_INIT) + infof(data, "WARNING: failed to load NSS PEM library %s. Using " |