]> granicus.if.org Git - php/commitdiff
Fix a few places where ZPP throw got reverted to ZPP
authorSammy Kaye Powers <sammyk@sammykmedia.com>
Thu, 31 Aug 2017 21:55:40 +0000 (16:55 -0500)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 5 Sep 2017 14:39:24 +0000 (16:39 +0200)
ext/sodium/libsodium.c

index 35a3ddf3b6f10d95b59cded035973316e49cbcf5..66eb1f41f13c92465083ce6eb65844ca049b3a31 100644 (file)
@@ -3075,7 +3075,7 @@ PHP_FUNCTION(sodium_crypto_kdf_derive_from_key)
        size_t         ctx_len;
        size_t         key_len;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS(), "llss",
+       if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "llss",
                                                          &subkey_len,
                                                          &subkey_id,
                                                          &ctx, &ctx_len,
@@ -3143,7 +3143,7 @@ PHP_FUNCTION(sodium_pad)
        size_t          xpadlen;
        size_t          xpadded_len;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS(), "sl",
+       if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "sl",
                                                          &unpadded, &unpadded_len, &blocksize) == FAILURE) {
                sodium_remove_param_values_from_backtrace(EG(exception));
                return;
@@ -3212,7 +3212,7 @@ PHP_FUNCTION(sodium_unpad)
        zend_long    blocksize;
        int          ret;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS(), "sl",
+       if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "sl",
                                                          &padded, &padded_len, &blocksize) == FAILURE) {
                sodium_remove_param_values_from_backtrace(EG(exception));
                return;