- fix #60895, possible invalid handler usage

diff --git a/NEWS b/NEWS
index 773f84b5e2f4e4055f6550bd8509af9d83747efa..997da8c5783bc91ca7ce2a26e70c9f03f7fb5919 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,23 +3,25 @@ PHP                                                                        NEWS
 ?? ?? 2012, PHP 5.3.10
 
 - Core:
- . Fixed bug #60227 (header() cannot detect the multi-line header with CR).
-   (rui)
- . Fixed bug #60825 (Segfault when running symfony 2 tests).
-   (Dmitry, Laruence)
+  . Fixed bug #60227 (header() cannot detect the multi-line header with CR).
+    (rui)
+  . Fixed bug #60825 (Segfault when running symfony 2 tests).
+    (Dmitry, Laruence)
+  . Fix bug #60895 (Possible invalid handler usage in windows random
+    functions). (Pierre)
 
 - Firebird Database extension (ibase):
- . Fixed bug #60802 (ibase_trans() gives segfault when passing params).
+  . Fixed bug #60802 (ibase_trans() gives segfault when passing params).
 
 - Streams:
- . Further fix for bug #60455 (stream_get_line misbehaves if EOF is not detected
-   together with the last read). (Gustavo)
- . Fixed bug #60817 (stream_get_line() reads from stream even when there is
-   already sufficient data buffered). stream_get_line() now behaves more like
-   fgets(), as is documented. (Gustavo)
+  . Further fix for bug #60455 (stream_get_line misbehaves if EOF is not detected
+    together with the last read). (Gustavo)
+  . Fixed bug #60817 (stream_get_line() reads from stream even when there is
+    already sufficient data buffered). stream_get_line() now behaves more like
+    fgets(), as is documented. (Gustavo)
 
 - PHP-FPM SAPI:
- . Fixed bug #60811 (php-fpm compilation problem). (rasmus)
+  . Fixed bug #60811 (php-fpm compilation problem). (rasmus)
  
 10 Jan 2012, PHP 5.3.9
 

diff --git a/win32/winutil.c b/win32/winutil.c
index c3e668b710de55a8007526fc50b20a1752ed411b..878e95ca896b6a76b169f4cbcd9f596f1531911d 100644 (file)
--- a/win32/winutil.c
+++ b/win32/winutil.c
@@ -62,8 +62,10 @@ void php_win32_init_rng_lock()
 void php_win32_free_rng_lock()
 {
        tsrm_mutex_lock(php_lock_win32_cryptoctx);
-       CryptReleaseContext(hCryptProv, 0);
-       has_crypto_ctx = 0;
+       if (has_crypto_ctx == 1) {
+               CryptReleaseContext(hCryptProv, 0);
+               has_crypto_ctx = 0;
+       }
        tsrm_mutex_unlock(php_lock_win32_cryptoctx);
        tsrm_mutex_free(php_lock_win32_cryptoctx);