fix segfault in openssl_seal(), add test

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 6d7cf7bf6815db13d1e83fbb9ba92a85e9bc53a4..be4534b5e51298dabb55800f21b6b18c8f6e5e67 100644 (file)
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -3041,7 +3041,9 @@ PHP_FUNCTION(openssl_seal)
        pkeys = safe_emalloc(nkeys, sizeof(*pkeys), 0);
        eksl = safe_emalloc(nkeys, sizeof(*eksl), 0);
        eks = safe_emalloc(nkeys, sizeof(*eks), 0);
+       memset(eks, 0, sizeof(*eks) * nkeys);
        key_resources = safe_emalloc(nkeys, sizeof(long), 0);
+       memset(key_resources, 0, sizeof(*key_resources) * nkeys);
 
        /* get the public keys we are using to seal this data */
        zend_hash_internal_pointer_reset_ex(pubkeysht, &pos);

diff --git a/ext/openssl/tests/002.phpt b/ext/openssl/tests/002.phpt
new file mode 100644 (file)
index 0000000..42b1fdb
--- /dev/null
+++ b/ext/openssl/tests/002.phpt
@@ -0,0 +1,45 @@
+--TEST--
+openssl_seal() tests
+--SKIPIF--
+<?php if (!extension_loaded("openssl")) print "skip"; ?>
+--FILE--
+<?php
+
+$a = 1;
+$b = array(1);
+$c = array(1);
+$d = array(1);
+
+var_dump(openssl_seal($a, $b, $c, $d));
+var_dump(openssl_seal($a, $a, $a, array()));
+var_dump(openssl_seal($c, $c, $c, 1));
+var_dump(openssl_seal($b, $b, $b, ""));
+
+echo "Done\n";
+?>
+--EXPECTF--    
+Warning: openssl_seal(): not a public key (0th member of pubkeys) in %s on line %d
+bool(false)
+
+Warning: openssl_seal(): Fourth argument to openssl_seal() must be a non-empty array in %s on line %d
+bool(false)
+
+Warning: openssl_seal() expects parameter 1 to be string, array given in %s on line %d
+NULL
+
+Warning: openssl_seal() expects parameter 1 to be string, array given in %s on line %d
+NULL
+Done
+--UEXPECTF--
+Warning: openssl_seal(): not a public key (0th member of pubkeys) in %s on line %d
+bool(false)
+
+Warning: openssl_seal(): Fourth argument to openssl_seal() must be a non-empty array in %s on line %d
+bool(false)
+
+Warning: openssl_seal() expects parameter 1 to be binary string, array given in %s on line %d
+NULL
+
+Warning: openssl_seal() expects parameter 1 to be binary string, array given in %s on line %d
+NULL
+Done