diff options
| author | Sara Golemon <pollita@php.net> | 2004-07-14 00:14:43 +0000 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2004-07-14 00:14:43 +0000 |
| commit | c4bf45e39ad40ca4de34558e5d9b3a61ed97eab4 (patch) | |
| tree | c0ce3345caa4457afd3c5eeaddcf03e6899a1296 | |
| parent | 2ec89aa8e1f159ee0461886744dc0f4da4276c15 (diff) | |
| download | php-git-c4bf45e39ad40ca4de34558e5d9b3a61ed97eab4.tar.gz | |
Bugfix# 28829 bcmath values for 0, 1, and 2 initialized/freed at wrong time for threaded sapis.
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/bcmath/bcmath.c | 30 | ||||
| -rw-r--r-- | ext/bcmath/php_bcmath.h | 2 |
3 files changed, 26 insertions, 7 deletions
@@ -1,6 +1,7 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2004, PHP 5.0.1 +- Fixed bug #28829 (Thread-unsafety in bcmath elementary values). (Sara) 13 Jul 2004, PHP 5.0.0 - Updated PCRE to provide better error handling in certain cases. (Andrei) diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c index b4f5de75e5..94d3b90d59 100644 --- a/ext/bcmath/bcmath.c +++ b/ext/bcmath/bcmath.c @@ -53,8 +53,8 @@ zend_module_entry bcmath_module_entry = { bcmath_functions, PHP_MINIT(bcmath), PHP_MSHUTDOWN(bcmath), - NULL, - NULL, + PHP_RINIT(bcmath), + PHP_RSHUTDOWN(bcmath), PHP_MINFO(bcmath), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES @@ -86,8 +86,6 @@ PHP_MINIT_FUNCTION(bcmath) REGISTER_INI_ENTRIES(); - bc_init_numbers(TSRMLS_C); - return SUCCESS; } /* }}} */ @@ -96,15 +94,33 @@ PHP_MINIT_FUNCTION(bcmath) */ PHP_MSHUTDOWN_FUNCTION(bcmath) { + UNREGISTER_INI_ENTRIES(); + + return SUCCESS; +} +/* }}} */ + +/* {{{ PHP_RINIT_FUNCTION + */ +PHP_RINIT_FUNCTION(bcmath) +{ + bc_init_numbers(TSRMLS_C); + + return SUCCESS; +} +/* }}} */ + +/* {{{ PHP_RSHUTDOWN_FUNCTION + */ +PHP_RSHUTDOWN_FUNCTION(bcmath) +{ _bc_free_num_ex(&BCG(_zero_), 1); _bc_free_num_ex(&BCG(_one_), 1); _bc_free_num_ex(&BCG(_two_), 1); - UNREGISTER_INI_ENTRIES(); - return SUCCESS; } -/* }}} */ +/* }}} */ /* {{{ PHP_MINFO_FUNCTION */ diff --git a/ext/bcmath/php_bcmath.h b/ext/bcmath/php_bcmath.h index 32d005e226..c99fd2534c 100644 --- a/ext/bcmath/php_bcmath.h +++ b/ext/bcmath/php_bcmath.h @@ -30,6 +30,8 @@ extern zend_module_entry bcmath_module_entry; PHP_MINIT_FUNCTION(bcmath); PHP_MSHUTDOWN_FUNCTION(bcmath); +PHP_RINIT_FUNCTION(bcmath); +PHP_RSHUTDOWN_FUNCTION(bcmath); PHP_MINFO_FUNCTION(bcmath); PHP_FUNCTION(bcadd); |