[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  80926502986a97eed53afe1d85fc074e40829547 (commit)
      from  895ffe41c2c7ed11f2362cbc59ed7070a4f1fe10 (commit)


- Log -----------------------------------------------------------------
commit 80926502986a97eed53afe1d85fc074e40829547
Author: Roumen Petrov <openssl at roumenpetrov.info>
Date:   Sat Feb 6 14:07:39 2016 +0200

    avoid crash if hostserv is with host part only
    
    	(if priority is set to host)
    
    Signed-off-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

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

diff --git a/crypto/bio/b_addr.c b/crypto/bio/b_addr.c
index f1ff5fe..a2a0dd2 100644
--- a/crypto/bio/b_addr.c
+++ b/crypto/bio/b_addr.c
@@ -505,7 +505,7 @@ int BIO_parse_hostserv(const char *hostserv, char **host, char **service,
         }
     }
 
-    if (strchr(p, ':'))
+    if (p != NULL && strchr(p, ':'))
         goto spec_err;
 
     if (h != NULL && host != NULL) {