[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  947f9da1019a8942e716cdcd44db211992aec295 (commit)
      from  c86d1f19fc69adacdd8d5955193330e18a0c7ebb (commit)


- Log -----------------------------------------------------------------
commit 947f9da1019a8942e716cdcd44db211992aec295
Author: Dmitry-Me <wipedout at yandex.ru>
Date:   Thu Feb 4 10:11:26 2016 +0300

    Fix potential buffer overrun
    
    Signed-off-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>

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

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

diff --git a/crypto/dso/dso_dl.c b/crypto/dso/dso_dl.c
index 2b56e9e..6407bf7 100644
--- a/crypto/dso/dso_dl.c
+++ b/crypto/dso/dso_dl.c
@@ -265,7 +265,7 @@ static char *dl_merger(DSO *dso, const char *filespec1, const char *filespec2)
         spec2len = (filespec2 ? strlen(filespec2) : 0);
         len = spec2len + (filespec1 ? strlen(filespec1) : 0);
 
-        if (filespec2 && filespec2[spec2len - 1] == '/') {
+        if (spec2len && filespec2[spec2len - 1] == '/') {
             spec2len--;
             len--;
         }