[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  97b04399b6b20d59ce4898def02011ee80914638 (commit)
      from  33ea23dc5c8d20b29b45bb09784ff907386ff4c1 (commit)


- Log -----------------------------------------------------------------
commit 97b04399b6b20d59ce4898def02011ee80914638
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Apr 26 17:00:33 2016 +0100

    Fix passwd seg fault
    
    Passing the -stdin arg to the passwd command line app *and* supply a
    password on the command line causes a seg fault.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 apps/passwd.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/passwd.c b/apps/passwd.c
index 98092bb..2f114db 100644
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -175,6 +175,7 @@ int passwd_main(int argc, char **argv)
             if (pw_source_defined)
                 goto opthelp;
             in_stdin = 1;
+            pw_source_defined = 1;
             break;
         }
     }