diff options
| -rw-r--r-- | Zend/Zend.m4 | 3 | ||||
| -rw-r--r-- | Zend/configure.in | 14 | ||||
| -rw-r--r-- | configure.in | 14 | ||||
| -rw-r--r-- | ext/standard/config.m4 | 12 | ||||
| -rw-r--r-- | ext/standard/tests/math/bug74039.phpt | 28 |
5 files changed, 50 insertions, 21 deletions
diff --git a/Zend/Zend.m4 b/Zend/Zend.m4 index 9d3b46a755..283d279ee9 100644 --- a/Zend/Zend.m4 +++ b/Zend/Zend.m4 @@ -100,7 +100,8 @@ AC_FUNC_ALLOCA AC_CHECK_FUNCS(memcpy strdup getpid kill strtod strtol finite fpclass sigsetjmp) AC_ZEND_BROKEN_SPRINTF -AC_CHECK_FUNCS(finite isfinite isinf isnan) +AC_CHECK_FUNCS(finite) +AC_CHECK_DECLS([isfinite, isnan, isinf], [], [], [[#include <math.h>]]) ZEND_FP_EXCEPT diff --git a/Zend/configure.in b/Zend/configure.in index 3c7915156c..5733b30ce0 100644 --- a/Zend/configure.in +++ b/Zend/configure.in @@ -64,13 +64,13 @@ int zend_sprintf(char *buffer, const char *format, ...); /* To enable the is_nan, is_infinite and is_finite PHP functions */ #ifdef NETWARE - #define HAVE_ISNAN 1 - #define HAVE_ISINF 1 - #define HAVE_ISFINITE 1 + #define HAVE_DECL_ISNAN 1 + #define HAVE_DECL_ISINF 1 + #define HAVE_DECL_ISINFINITE 1 #endif #ifndef zend_isnan -#ifdef HAVE_ISNAN +#ifdef HAVE_DECL_ISNAN #define zend_isnan(a) isnan(a) #elif defined(HAVE_FPCLASS) #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) @@ -79,18 +79,18 @@ int zend_sprintf(char *buffer, const char *format, ...); #endif #endif -#ifdef HAVE_ISINF +#ifdef HAVE_DECL_ISINF #define zend_isinf(a) isinf(a) #elif defined(INFINITY) /* Might not work, but is required by ISO C99 */ -#define zend_isinf(a) (((a)==INFINITY)?1:0) +#define zend_isinf(a) (((a)==INFINITY || (a)==-INFINITY)?1:0) #elif defined(HAVE_FPCLASS) #define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF)) #else #define zend_isinf(a) 0 #endif -#if defined(HAVE_ISFINITE) || defined(isfinite) +#if defined(HAVE_DECL_ISINFINITE) || defined(isfinite) #define zend_finite(a) isfinite(a) #elif defined(HAVE_FINITE) #define zend_finite(a) finite(a) diff --git a/configure.in b/configure.in index b6380c5cdc..452212389d 100644 --- a/configure.in +++ b/configure.in @@ -69,13 +69,13 @@ int zend_sprintf(char *buffer, const char *format, ...); /* To enable the is_nan, is_infinite and is_finite PHP functions */ #ifdef NETWARE - #define HAVE_ISNAN 1 - #define HAVE_ISINF 1 - #define HAVE_ISFINITE 1 + #define HAVE_DECL_ISNAN 1 + #define HAVE_DECL_ISINF 1 + #define HAVE_DECL_ISINFINITE 1 #endif #ifndef zend_isnan -#ifdef HAVE_ISNAN +#ifdef HAVE_DECL_ISNAN #define zend_isnan(a) isnan(a) #elif defined(HAVE_FPCLASS) #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) @@ -84,18 +84,18 @@ int zend_sprintf(char *buffer, const char *format, ...); #endif #endif -#ifdef HAVE_ISINF +#ifdef HAVE_DECL_ISINF #define zend_isinf(a) isinf(a) #elif defined(INFINITY) /* Might not work, but is required by ISO C99 */ -#define zend_isinf(a) (((a)==INFINITY)?1:0) +#define zend_isinf(a) (((a)==INFINITY || (a)==-INFINITY)?1:0) #elif defined(HAVE_FPCLASS) #define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF)) #else #define zend_isinf(a) 0 #endif -#if defined(HAVE_ISFINITE) || defined(isfinite) +#if defined(HAVE_DECL_ISINFINITE) || defined(isfinite) #define zend_finite(a) isfinite(a) #elif defined(HAVE_FINITE) #define zend_finite(a) finite(a) diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index f2a1925d1e..3324ee7a16 100644 --- a/ext/standard/config.m4 +++ b/ext/standard/config.m4 @@ -359,7 +359,7 @@ AC_TRY_RUN([ #include <math.h> #include <stdlib.h> -#ifdef HAVE_ISNAN +#ifdef HAVE_DECL_ISNAN #define zend_isnan(a) isnan(a) #elif defined(HAVE_FPCLASS) #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) @@ -390,11 +390,11 @@ AC_TRY_RUN([ #include <math.h> #include <stdlib.h> -#ifdef HAVE_ISINF +#ifdef HAVE_DECL_ISINF #define zend_isinf(a) isinf(a) #elif defined(INFINITY) /* Might not work, but is required by ISO C99 */ -#define zend_isinf(a) (((a)==INFINITY)?1:0) +#define zend_isinf(a) (((a)==INFINITY || (a)==-INFINITY)?1:0) #elif defined(HAVE_FPCLASS) #define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF)) #else @@ -424,11 +424,11 @@ AC_TRY_RUN([ #include <math.h> #include <stdlib.h> -#ifdef HAVE_ISINF +#ifdef HAVE_DECL_ISINF #define zend_isinf(a) isinf(a) #elif defined(INFINITY) /* Might not work, but is required by ISO C99 */ -#define zend_isinf(a) (((a)==INFINITY)?1:0) +#define zend_isinf(a) (((a)==INFINITY || (a)==-INFINITY)?1:0) #elif defined(HAVE_FPCLASS) #define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF)) #else @@ -459,7 +459,7 @@ AC_TRY_RUN([ #include <math.h> #include <stdlib.h> -#ifdef HAVE_ISNAN +#ifdef HAVE_DECL_ISNAN #define zend_isnan(a) isnan(a) #elif defined(HAVE_FPCLASS) #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) diff --git a/ext/standard/tests/math/bug74039.phpt b/ext/standard/tests/math/bug74039.phpt new file mode 100644 index 0000000000..dd0e1fa260 --- /dev/null +++ b/ext/standard/tests/math/bug74039.phpt @@ -0,0 +1,28 @@ +--TEST-- +Bug #74039: is_infinite(-INF) returns false +--FILE-- +<?php + +var_dump(is_finite(INF)); +var_dump(is_infinite(INF)); +var_dump(is_nan(INF)); + +var_dump(is_finite(-INF)); +var_dump(is_infinite(-INF)); +var_dump(is_nan(-INF)); + +var_dump(is_finite(NAN)); +var_dump(is_infinite(NAN)); +var_dump(is_nan(NAN)); + +?> +--EXPECT-- +bool(false) +bool(true) +bool(false) +bool(false) +bool(true) +bool(false) +bool(false) +bool(false) +bool(true) |