summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS4
-rw-r--r--ext/mcrypt/mcrypt.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 55b84e222d..fdfb050a5b 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,10 @@ PHP NEWS
. Fixed bug #52935 (call exit in user_error_handler cause stream relate
core). (Gustavo)
+- MCrypt
+ . Change E_ERROR to E_WARNING in mcrypt_create_iv when not enough data
+ has been fetched (Windows). (Pierre)
+
- PDO DBlib:
. Fixed bug #54329 (MSSql extension memory leak).
(dotslashpok at gmail dot com)
diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c
index 0d1ad3b850..609dac1d5f 100644
--- a/ext/mcrypt/mcrypt.c
+++ b/ext/mcrypt/mcrypt.c
@@ -1394,7 +1394,7 @@ PHP_FUNCTION(mcrypt_create_iv)
BYTE *iv_b = (BYTE *) iv;
if (php_win32_get_random_bytes(iv_b, (size_t) size) == FAILURE){
efree(iv);
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Could not gather sufficient random data");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not gather sufficient random data");
RETURN_FALSE;
}
n = size;