diff options
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch b/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch index cebc8cf0d0..f736e5c098 100644 --- a/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch +++ b/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch | |||
@@ -8,16 +8,16 @@ http://www.mail-archive.com/openssl-dev@openssl.org/msg32860.html | |||
8 | 8 | ||
9 | Signed-off-by: Xufeng Zhang <xufeng.zhang@windriver.com> | 9 | Signed-off-by: Xufeng Zhang <xufeng.zhang@windriver.com> |
10 | --- | 10 | --- |
11 | Index: openssl-1.0.2/crypto/evp/digest.c | 11 | Index: openssl-1.0.2h/crypto/evp/digest.c |
12 | =================================================================== | 12 | =================================================================== |
13 | --- openssl-1.0.2.orig/crypto/evp/digest.c | 13 | --- openssl-1.0.2h.orig/crypto/evp/digest.c |
14 | +++ openssl-1.0.2/crypto/evp/digest.c | 14 | +++ openssl-1.0.2h/crypto/evp/digest.c |
15 | @@ -208,7 +208,7 @@ int EVP_DigestInit_ex(EVP_MD_CTX *ctx, c | 15 | @@ -211,7 +211,7 @@ int EVP_DigestInit_ex(EVP_MD_CTX *ctx, c |
16 | return 0; | 16 | type = ctx->digest; |
17 | } | 17 | } |
18 | #endif | 18 | #endif |
19 | - if (ctx->digest != type) { | 19 | - if (ctx->digest != type) { |
20 | + if (type && (ctx->digest != type)) { | 20 | + if (type && (ctx->digest != type)) { |
21 | if (ctx->digest && ctx->digest->ctx_size) | 21 | if (ctx->digest && ctx->digest->ctx_size) { |
22 | OPENSSL_free(ctx->md_data); | 22 | OPENSSL_free(ctx->md_data); |
23 | ctx->digest = type; | 23 | ctx->md_data = NULL; |