]> granicus.if.org Git - php/commitdiff
- Use of E_RECOVERABLE_ERROR
authorMarcus Boerger <helly@php.net>
Thu, 11 May 2006 08:06:22 +0000 (08:06 +0000)
committerMarcus Boerger <helly@php.net>
Thu, 11 May 2006 08:06:22 +0000 (08:06 +0000)
ext/mcrypt/mcrypt.c
ext/spl/spl_array.c

index 80b5a462a33ebe3b8d997391f90a0f0dff65e5ec..878c883611d46fc4d96574d7377c07a36fd61ea5 100644 (file)
@@ -1097,7 +1097,8 @@ static void php_mcrypt_do_crypt (char* cipher, zval **key, zval **data, char *mo
        }
 
        if (mcrypt_generic_init(td, key_s, use_key_length, iv_s) < 0) {
-               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Mcrypt initialisation failed");
+               php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, "Mcrypt initialisation failed");
+               RETURN_FALSE;
        }
        if (dencrypt == MCRYPT_ENCRYPT) {
                mcrypt_generic(td, data_s, data_size);
index 02b849d4c308b4f6ef4718d3031e48cb89231e04..81ac9843204719a5bbd0503929791f0986220413 100755 (executable)
@@ -522,7 +522,7 @@ void spl_array_iterator_append(zval *object, zval *append_value TSRMLS_DC) /* {{
        }
        
        if (Z_TYPE_P(intern->array) == IS_OBJECT) {
-               php_error_docref(NULL TSRMLS_CC, E_ERROR, "Cannot append properties to objects, use %s::offsetSet() instead", Z_OBJCE_P(object)->name);
+               php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, "Cannot append properties to objects, use %s::offsetSet() instead", Z_OBJCE_P(object)->name);
                return;
        }