[openssl] master update

tomas at openssl.org tomas at openssl.org
Wed Dec 29 15:01:49 UTC 2021


The branch master has been updated
       via  ff7cdc15875293a330831a80d83edbafd25a9d36 (commit)
      from  40586e462df76adf163e0d31879dc2d5fa90e109 (commit)


- Log -----------------------------------------------------------------
commit ff7cdc15875293a330831a80d83edbafd25a9d36
Author: Weiguo Li <liwg06 at foxmail.com>
Date:   Tue Dec 28 00:05:54 2021 +0800

    Fix a misuse of NULL check
    
    Fixes: #17356
    
    CLA: trivial
    
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/17357)

-----------------------------------------------------------------------

Summary of changes:
 crypto/rand/rand_egd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/rand/rand_egd.c b/crypto/rand/rand_egd.c
index bb862f61ad..4ea6846ccb 100644
--- a/crypto/rand/rand_egd.c
+++ b/crypto/rand/rand_egd.c
@@ -80,7 +80,7 @@ int hpns_socket(int family,
 #  define AF_UNIX_PORTABILITY    "$ZAFN2"
 #  define AF_UNIX_COMPATIBILITY  "$ZPLS"
 
-    if (!_arg_present(transport) || transport != NULL || transport[0] == '\0')
+    if (!_arg_present(transport) || transport == NULL || transport[0] == '\0')
         return socket(family, type, protocol);
 
     socket_transport_name_get(AF_UNIX, current_transport, 20);


More information about the openssl-commits mailing list