[systemd-commits] src/cryptsetup

[Thomas H.P. Andersen]

 src/cryptsetup/cryptsetup.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f268f57f6344d3a2ccf447352ff3ed1313c4a199
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date:   Thu Jun 12 22:50:04 2014 +0200

    cryptsetup: check that password is not null
    
    Beef up the assert to protect against passing null to strlen.
    
    Found with scan-build.

diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index 812b32f..a67d85e 100644
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -344,7 +344,7 @@ static int attach_tcrypt(struct crypt_device *cd,
 
         assert(cd);
         assert(name);
-        assert(key_file || passwords);
+        assert(key_file || (passwords && passwords[0]));
 
         if (arg_tcrypt_hidden)
                 params.flags |= CRYPT_TCRYPT_HIDDEN_HEADER;