From: Derick Rethans <derick@php.net>
Date: Mon, 24 Jun 2002 08:00:51 +0000 (+0000)
Subject: - MFH
X-Git-Tag: php-4.2.3RC1~103
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=322ce93714d00da0cf162a0ed46a691227c04d71;p=php

- MFH
---

diff --git a/ext/standard/math.c b/ext/standard/math.c
index 4ca710d235..1f2b0fd2cf 100644
--- a/ext/standard/math.c
+++ b/ext/standard/math.c
@@ -757,7 +757,7 @@ _php_math_longtobase(zval *arg, int base)
  * the number.
  */
 PHPAPI char *
-_php_math_zvaltobase(zval *arg, int base)
+_php_math_zvaltobase(zval *arg, int base TSRMLS_DC)
 {
 	static char digits[] = "0123456789abcdefghijklmnopqrstuvwxyz";
 
@@ -770,6 +770,13 @@ _php_math_zvaltobase(zval *arg, int base)
 		char *ptr, *end;
 		char buf[(sizeof(double) << 3) + 1];
 
+		/* Don't try to convert +/- infinity */
+		if (fvalue == HUGE_VAL || fvalue == -HUGE_VAL) {
+			php_error(E_WARNING, "Number too large in %s() call",
+				get_active_function_name(TSRMLS_C));
+			return empty_string;
+		}
+		
 		end = ptr = buf + sizeof(buf) - 1;
 		*ptr = '\0';
 
@@ -927,7 +934,7 @@ PHP_FUNCTION(base_convert)
 		RETURN_FALSE;
 	}
 
-	if(_php_math_basetozval(*number, Z_LVAL_PP(frombase), &temp) != SUCCESS) {
+	if(_php_math_basetozval(*number, Z_LVAL_PP(frombase), &temp TSRMLS_CC) != SUCCESS) {
 		RETURN_FALSE;
 	}
 	result = _php_math_zvaltobase(&temp, Z_LVAL_PP(tobase));