diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-01-06 15:21:42 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-01-06 15:21:42 +0100 |
| commit | 86b436d797081f63036a0db91802bc74aa0501aa (patch) | |
| tree | 8460d745a79ee0597cde583262faf72c661ab8be /external/openssl | |
| parent | 8672eca430213c28936a526df6266226ecb7ab2d (diff) | |
external/openssl: Work around -fsanitize=null
Change-Id: Ic47a1b43323f84971aed9b3cdb2ec83f9e931d6a
Diffstat (limited to 'external/openssl')
| -rw-r--r-- | external/openssl/UnpackedTarball_openssl.mk | 1 | ||||
| -rw-r--r-- | external/openssl/ubsan.patch.0 | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/external/openssl/UnpackedTarball_openssl.mk b/external/openssl/UnpackedTarball_openssl.mk index 98844b99ee3a..cf5f5ddfd4d2 100644 --- a/external/openssl/UnpackedTarball_openssl.mk +++ b/external/openssl/UnpackedTarball_openssl.mk @@ -30,6 +30,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,openssl,\ $(if $(filter SOLARIS,$(OS)),external/openssl/opensslsol.patch) \ $(if $(filter IOS,$(OS)),external/openssl/opensslios.patch) \ $(if $(filter MACOSXPOWERPC,$(OS)$(CPUNAME)),external/openssl/opensslosxppc.patch) \ + external/openssl/ubsan.patch.0 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/openssl/ubsan.patch.0 b/external/openssl/ubsan.patch.0 new file mode 100644 index 000000000000..c3fffb3581ba --- /dev/null +++ b/external/openssl/ubsan.patch.0 @@ -0,0 +1,10 @@ +--- crypto/engine/eng_table.c ++++ crypto/engine/eng_table.c +@@ -346,6 +346,6 @@ + ENGINE_PILE_DOALL dall; + dall.cb = cb; + dall.arg = arg; +- lh_ENGINE_PILE_doall_arg(&table->piles, LHASH_DOALL_ARG_FN(int_cb), ++ lh_ENGINE_PILE_doall_arg(table ? &table->piles : NULL, LHASH_DOALL_ARG_FN(int_cb), + ENGINE_PILE_DOALL, &dall); + } |