[openssl] master update

Richard Levitte levitte at openssl.org
Thu Aug 29 16:14:52 UTC 2019


The branch master has been updated
       via  51fe9b00d2fe33aa383f9c04b9c4ec153af63c45 (commit)
      from  9a7846dfe512baa55ad0485b67ffdbb2cb3a5cc3 (commit)


- Log -----------------------------------------------------------------
commit 51fe9b00d2fe33aa383f9c04b9c4ec153af63c45
Author: Dr. David von Oheimb <David.von.Oheimb at siemens.com>
Date:   Thu Aug 8 22:30:38 2019 +0200

    fix ERR_add_error_vdata() for use with multiple args/calls
    
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/9558)

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

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

diff --git a/crypto/err/err.c b/crypto/err/err.c
index 24549e3a49..daa4e6e419 100644
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -790,7 +790,7 @@ void ERR_add_error_vdata(int num, va_list args)
     }
     len = strlen(str);
 
-    for (len = 0; --num >= 0; ) {
+    while (--num >= 0) {
         arg = va_arg(args, char *);
         if (arg == NULL)
             arg = "<NULL>";


More information about the openssl-commits mailing list