summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2011-07-11 17:01:23 +0000
committerIlia Alshanetsky <iliaa@php.net>2011-07-11 17:01:23 +0000
commit992d32c6a7d5ffd68db78d147dd221fd78ea9422 (patch)
tree24b8489f09d0d917f1775b100389893f37475a6f
parentac1ae51a3865c24bb452991714c7efe4c05e7eb1 (diff)
downloadphp-git-992d32c6a7d5ffd68db78d147dd221fd78ea9422.tar.gz
Fixed bug #55014 (Compile failure due to improper use of ctime_r()).
-rw-r--r--NEWS1
-rw-r--r--main/reentrancy.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 6f1f63a08c..97c4031d59 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ PHP NEWS
though the class has none). (Felipe)
- Core
+ . Fixed bug #55014 (Compile failure due to improper use of ctime_r()). (Ilia)
. Fixed bug #54332 (Crash in zend_mm_check_ptr // Heap corruption). (Dmitry)
. Fixed bug #54305 (Crash in gc_remove_zval_from_buffer). (Dmitry)
. Fixed bug #53727 (Inconsistent behavior of is_subclass_of with interfaces)
diff --git a/main/reentrancy.c b/main/reentrancy.c
index 5a714273b9..b2fe8f117f 100644
--- a/main/reentrancy.c
+++ b/main/reentrancy.c
@@ -60,14 +60,14 @@ static MUTEX_T reentrant_locks[NUMBER_OF_LOCKS];
PHPAPI char *php_ctime_r(const time_t *clock, char *buf)
{
- if (ctime_r(clock, buf, 26) == buf)
+ if (ctime_r(clock, buf) == buf)
return (buf);
return (NULL);
}
PHPAPI char *php_asctime_r(const struct tm *tm, char *buf)
{
- if (asctime_r(tm, buf, 26) == buf)
+ if (asctime_r(tm, buf) == buf)
return (buf);
return (NULL);
}