summaryrefslogtreecommitdiff
path: root/openssl-freefilesync/openssl-1.1.1-regression-fixes.patch
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2019-07-16 13:25:19 +0000
committerB Stack <bgstack15@gmail.com>2019-07-16 13:25:19 +0000
commit240c7ecb12cd1ebb9780de70c4d15b0a84854020 (patch)
tree6fb69bb5ec481b1ce68892d0b4c14e7bb75e66c2 /openssl-freefilesync/openssl-1.1.1-regression-fixes.patch
parentfreefilesync dpkg add unzip (diff)
parentMerge branch 'freefilesync-rpm' into 'freefilesync-bump' (diff)
downloadstackrpms-240c7ecb12cd1ebb9780de70c4d15b0a84854020.tar.gz
stackrpms-240c7ecb12cd1ebb9780de70c4d15b0a84854020.tar.bz2
stackrpms-240c7ecb12cd1ebb9780de70c4d15b0a84854020.zip
Merge branch 'freefilesync-bump' into 'master'
Freefilesync 10.14 See merge request bgstack15/stackrpms!73
Diffstat (limited to 'openssl-freefilesync/openssl-1.1.1-regression-fixes.patch')
-rw-r--r--openssl-freefilesync/openssl-1.1.1-regression-fixes.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/openssl-freefilesync/openssl-1.1.1-regression-fixes.patch b/openssl-freefilesync/openssl-1.1.1-regression-fixes.patch
new file mode 100644
index 0000000..11099a1
--- /dev/null
+++ b/openssl-freefilesync/openssl-1.1.1-regression-fixes.patch
@@ -0,0 +1,16 @@
+diff -up openssl-1.1.1b/crypto/conf/conf_lib.c.regression openssl-1.1.1b/crypto/conf/conf_lib.c
+--- openssl-1.1.1b/crypto/conf/conf_lib.c.regression 2019-02-26 15:15:30.000000000 +0100
++++ openssl-1.1.1b/crypto/conf/conf_lib.c 2019-05-10 14:28:57.718049429 +0200
+@@ -356,8 +356,10 @@ OPENSSL_INIT_SETTINGS *OPENSSL_INIT_new(
+ {
+ OPENSSL_INIT_SETTINGS *ret = malloc(sizeof(*ret));
+
+- if (ret != NULL)
+- memset(ret, 0, sizeof(*ret));
++ if (ret == NULL)
++ return NULL;
++
++ memset(ret, 0, sizeof(*ret));
+ ret->flags = DEFAULT_CONF_MFLAGS;
+
+ return ret;
bgstack15