tony2001 Thu Jun 7 09:07:36 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pdo_sqlite/sqlite/src date.c
/php-src/ext/calendar easter.c
/php-src/ext/sqlite/libsqlite/src date.c
/php-src/ext/standard info.c
/php-src/ext/xmlrpc/libxmlrpc xmlrpc.c
Log:
MFH: php_localtime_r() checks
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite/src/date.c?r1=1.3.2.2.2.5&r2=1.3.2.2.2.6&diff_format=u
Index: php-src/ext/pdo_sqlite/sqlite/src/date.c
diff -u php-src/ext/pdo_sqlite/sqlite/src/date.c:1.3.2.2.2.5
php-src/ext/pdo_sqlite/sqlite/src/date.c:1.3.2.2.2.6
--- php-src/ext/pdo_sqlite/sqlite/src/date.c:1.3.2.2.2.5 Mon Apr 9
16:35:11 2007
+++ php-src/ext/pdo_sqlite/sqlite/src/date.c Thu Jun 7 09:07:36 2007
@@ -417,6 +417,9 @@
t = (x.rJD-2440587.5)*86400.0 + 0.5;
sqlite3OsEnterMutex();
pTm = php_localtime_r(&t, &tmbuf);
+ if (!pTm) {
+ return 0;
+ }
y.Y = pTm->tm_year + 1900;
y.M = pTm->tm_mon + 1;
y.D = pTm->tm_mday;
http://cvs.php.net/viewvc.cgi/php-src/ext/calendar/easter.c?r1=1.18.2.1.2.1&r2=1.18.2.1.2.2&diff_format=u
Index: php-src/ext/calendar/easter.c
diff -u php-src/ext/calendar/easter.c:1.18.2.1.2.1
php-src/ext/calendar/easter.c:1.18.2.1.2.2
--- php-src/ext/calendar/easter.c:1.18.2.1.2.1 Mon Jan 1 09:35:48 2007
+++ php-src/ext/calendar/easter.c Thu Jun 7 09:07:36 2007
@@ -36,10 +36,14 @@
/* Default to the current year if year parameter is not given */
{
time_t a;
- struct tm b;
+ struct tm b, *res;
time(&a);
- php_localtime_r(&a, &b);
- year = 1900 + b.tm_year;
+ res = php_localtime_r(&a, &b);
+ if (!res) {
+ year = 1900;
+ } else {
+ year = 1900 + b.tm_year;
+ }
}
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/libsqlite/src/date.c?r1=1.3.4.1.2.2&r2=1.3.4.1.2.3&diff_format=u
Index: php-src/ext/sqlite/libsqlite/src/date.c
diff -u php-src/ext/sqlite/libsqlite/src/date.c:1.3.4.1.2.2
php-src/ext/sqlite/libsqlite/src/date.c:1.3.4.1.2.3
--- php-src/ext/sqlite/libsqlite/src/date.c:1.3.4.1.2.2 Fri Dec 1 20:24:58 2006
+++ php-src/ext/sqlite/libsqlite/src/date.c Thu Jun 7 09:07:36 2007
@@ -16,7 +16,7 @@
** sqliteRegisterDateTimeFunctions() found at the bottom of the file.
** All other code has file scope.
**
-** $Id: date.c,v 1.3.4.1.2.2 2006/12/01 20:24:58 fmk Exp $
+** $Id: date.c,v 1.3.4.1.2.3 2007/06/07 09:07:36 tony2001 Exp $
**
** NOTES:
**
@@ -420,6 +420,9 @@
t = (x.rJD-2440587.5)*86400.0 + 0.5;
sqliteOsEnterMutex();
pTm = php_localtime_r(&t, &tmbuf);
+ if (!pTm) {
+ return 0;
+ }
y.Y = pTm->tm_year + 1900;
y.M = pTm->tm_mon + 1;
y.D = pTm->tm_mday;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.11&r2=1.249.2.10.2.12&diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10.2.11
php-src/ext/standard/info.c:1.249.2.10.2.12
--- php-src/ext/standard/info.c:1.249.2.10.2.11 Mon Apr 2 12:41:07 2007
+++ php-src/ext/standard/info.c Thu Jun 7 09:07:36 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: info.c,v 1.249.2.10.2.11 2007/04/02 12:41:07 sniper Exp $ */
+/* $Id: info.c,v 1.249.2.10.2.12 2007/06/07 09:07:36 tony2001 Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -1066,7 +1066,7 @@
the_time = time(NULL);
ta = php_localtime_r(&the_time, &tmbuf);
- if ((ta->tm_mon==3) && (ta->tm_mday==1)) {
+ if (ta && (ta->tm_mon==3) && (ta->tm_mday==1)) {
logo_guid = PHP_EGG_LOGO_GUID;
} else {
logo_guid = PHP_LOGO_GUID;
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c?r1=1.8.4.1&r2=1.8.4.2&diff_format=u
Index: php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c
diff -u php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c:1.8.4.1
php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c:1.8.4.2
--- php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c:1.8.4.1 Thu Nov 30 16:38:37 2006
+++ php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c Thu Jun 7 09:07:36 2007
@@ -31,7 +31,7 @@
*/
-static const char rcsid[] = "#(@) $Id: xmlrpc.c,v 1.8.4.1 2006/11/30 16:38:37
iliaa Exp $";
+static const char rcsid[] = "#(@) $Id: xmlrpc.c,v 1.8.4.2 2007/06/07 09:07:36
tony2001 Exp $";
/****h* ABOUT/xmlrpc
@@ -43,6 +43,9 @@
* 9/1999 - 10/2000
* HISTORY
* $Log: xmlrpc.c,v $
+ * Revision 1.8.4.2 2007/06/07 09:07:36 tony2001
+ * MFH: php_localtime_r() checks
+ *
* Revision 1.8.4.1 2006/11/30 16:38:37 iliaa
* last set of zts fixes
*
@@ -236,6 +239,9 @@
static int date_to_ISO8601 (time_t value, char *buf, int length) {
struct tm *tm, tmbuf;
tm = php_localtime_r(&value, &tmbuf);
+ if (!tm) {
+ return 0;
+ }
#if 0 /* TODO: soap seems to favor this method. xmlrpc the latter. */
return strftime (buf, length, "%Y-%m-%dT%H:%M:%SZ", tm);
#else
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
