diff options
| author | Pierre Joye <pajoye@php.net> | 2011-07-10 14:19:51 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2011-07-10 14:19:51 +0000 |
| commit | 8ec6ada08764166ddb195096fd99b1012024033b (patch) | |
| tree | f85cd7fd52270daa57631170e0a76a7adc569fcc | |
| parent | ae40e5f4007659aff6a7aaea981b23c0bae9d3ab (diff) | |
| download | php-git-8ec6ada08764166ddb195096fd99b1012024033b.tar.gz | |
- use warning here to match unix behavior
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/mcrypt/mcrypt.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -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; |