From: Marcus Boerger <helly@php.net>
Date: Thu, 11 May 2006 08:06:22 +0000 (+0000)
Subject: - Use of E_RECOVERABLE_ERROR
X-Git-Tag: php-5.2.0RC1~593
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac3c882bb6f4572df744ad500dc647ee6a473a94;p=php

- Use of E_RECOVERABLE_ERROR
---

diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c
index 80b5a462a3..878c883611 100644
--- a/ext/mcrypt/mcrypt.c
+++ b/ext/mcrypt/mcrypt.c
@@ -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);
diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
index 02b849d4c3..81ac984320 100755
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
@@ -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;
 	}