iliaa Fri Jun 8 00:41:58 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/bcmath bcmath.c
/php-src NEWS
Log:
Added missing error check inside bcpowmod().
http://cvs.php.net/viewvc.cgi/php-src/ext/bcmath/bcmath.c?r1=1.62.2.2.2.7&r2=1.62.2.2.2.8&diff_format=u
Index: php-src/ext/bcmath/bcmath.c
diff -u php-src/ext/bcmath/bcmath.c:1.62.2.2.2.7
php-src/ext/bcmath/bcmath.c:1.62.2.2.2.8
--- php-src/ext/bcmath/bcmath.c:1.62.2.2.2.7 Wed Jun 6 22:09:25 2007
+++ php-src/ext/bcmath/bcmath.c Fri Jun 8 00:41:57 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: bcmath.c,v 1.62.2.2.2.7 2007/06/06 22:09:25 tony2001 Exp $ */
+/* $Id: bcmath.c,v 1.62.2.2.2.8 2007/06/08 00:41:57 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -465,13 +465,17 @@
scale_int = (int) ((int)scale < 0) ? 0 : scale;
- bc_raisemod(first, second, mod, &result, scale_int TSRMLS_CC);
- if (result->n_scale > scale) {
- result->n_scale = scale;
+ if (bc_raisemod(first, second, mod, &result, scale_int TSRMLS_CC) !=
-1) {
+ if (result->n_scale > scale) {
+ result->n_scale = scale;
+ }
+ Z_STRVAL_P(return_value) = bc_num2str(result);
+ Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value));
+ Z_TYPE_P(return_value) = IS_STRING;
+ } else {
+ RETVAL_FALSE;
}
- Z_STRVAL_P(return_value) = bc_num2str(result);
- Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value));
- Z_TYPE_P(return_value) = IS_STRING;
+
bc_free_num(&first);
bc_free_num(&second);
bc_free_num(&mod);
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.767&r2=1.2027.2.547.2.768&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.767 php-src/NEWS:1.2027.2.547.2.768
--- php-src/NEWS:1.2027.2.547.2.767 Wed Jun 6 22:41:23 2007
+++ php-src/NEWS Fri Jun 8 00:41:57 2007
@@ -8,6 +8,7 @@
- Added missing open_basedir checks to CGI. (anight at eyelinkmedia dot com,
Tony)
- Added missing format validator to unpack() function. (Ilia)
+- Added missing error check inside bcpowmod(). (Ilia)
- Fixed several integer overflows in ImageCreate(), ImageCreateTrueColor(),
ImageCopyResampled() and ImageFilledPolygon() reported by Mattias Bengtsson.
(Tony)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
