commit 999c8ff92dbac8f33a9b63a9867862ff73934f4a
author Thomas Klausner <tk@giga.or.at> Fri Dec 16 16:03:34 2016 +0100
committer Thomas Klausner <tk@giga.or.at> Fri Dec 16 16:03:34 2016 +0100
tree b2df8bfa4c7b376b97acdaca8738f6589655f6d9
parent bd0fe20e33e1b95dd83d4de696c99a988e215b0d

Check for NULL before calling strlen.

Coverity 1397270

lib/zip_file_set_encryption.c

diff --git a/lib/zip_file_set_encryption.c b/lib/zip_file_set_encryption.c
index 91f9a27..06a25a9 100644
--- a/lib/zip_file_set_encryption.c
+++ b/lib/zip_file_set_encryption.c
@@ -88,7 +88,9 @@
 	
         if (e->changes == NULL) {
             if ((e->changes=_zip_dirent_clone(e->orig)) == NULL) {
-		_zip_crypto_clear(our_password, strlen(our_password));
+		if (our_password) {
+		    _zip_crypto_clear(our_password, strlen(our_password));
+		}
 		free(our_password);
                 zip_error_set(&za->error, ZIP_ER_MEMORY, 0);
                 return -1;