date:20091013

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/date/lib/timezonedb.h branches/PHP_5_3/ext/date/lib/timezonedb.h trunk/ext/date/lib/timezonedb.h

2009-10-13 Thread Derick Rethans

derick   Tue, 13 Oct 2009 08:16:35 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=289612

Log:
- Updated to version 2009.14 (2009n)

Changed paths:
U   php/php-src/branches/PHP_5_2/ext/date/lib/timezonedb.h
U   php/php-src/branches/PHP_5_3/ext/date/lib/timezonedb.h
U   php/php-src/trunk/ext/date/lib/timezonedb.h

Modified: php/php-src/branches/PHP_5_2/ext/date/lib/timezonedb.h
===
--- php/php-src/branches/PHP_5_2/ext/date/lib/timezonedb.h  2009-10-13 
07:52:23 UTC (rev 289611)
+++ php/php-src/branches/PHP_5_2/ext/date/lib/timezonedb.h  2009-10-13 
08:16:35 UTC (rev 289612)
@@ -8144,7 +8144,7 @@
 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x16, 0x89, 
0x7E, 0xFC, 0xA4,
 0xCC, 0x95, 0x32, 0xA8, 0xD2, 0x74, 0x12, 0x98, 0xDD, 0xA8, 0xE0, 0xA8, 0x02, 
0x4F, 0xAB, 0x30,
 0x3C, 0xAF, 0x45, 0xEC, 0x3D, 0x9F, 0x28, 0xDC, 0x48, 0x41, 0xA0, 0x30, 0x49, 
0x0B, 0x47, 0xA0,
-0x49, 0xE4, 0xDD, 0x30, 0x4A, 0xEC, 0x7B, 0x20, 0x01, 0x02, 0x01, 0x03, 0x05, 
0x04, 0x05, 0x04,
+0x49, 0xE4, 0xDD, 0x30, 0x4A, 0xC3, 0x9C, 0xA0, 0x01, 0x02, 0x01, 0x03, 0x05, 
0x04, 0x05, 0x04,
 0x05, 0x04, 0x05, 0x00, 0x00, 0x3E, 0xDC, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x58, 
0x00, 0x04, 0x00,
 0x00, 0x5B, 0x68, 0x01, 0x04, 0x00, 0x00, 0x46, 0x50, 0x00, 0x08, 0x00, 0x00, 
0x54, 0x60, 0x01,
 0x0D, 0x00, 0x00, 0x46, 0x50, 0x00, 0x12, 0x4C, 0x4D, 0x54, 0x00, 0x49, 0x53, 
0x54, 0x00, 0x4B,
@@ -18095,4 +18095,4 @@
 0x00, 0x00, 0x55, 0x54, 0x43, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 
0x12, 0xA8, 0x80,
 0x00, 0x00, 0x00, 0x00, };

-const timelib_tzdb timezonedb_builtin = { 2009.13, 560, 
timezonedb_idx_builtin, timelib_timezone_db_data_builtin };
+const timelib_tzdb timezonedb_builtin = { 2009.14, 560, 
timezonedb_idx_builtin, timelib_timezone_db_data_builtin };

Modified: php/php-src/branches/PHP_5_3/ext/date/lib/timezonedb.h
===
--- php/php-src/branches/PHP_5_3/ext/date/lib/timezonedb.h  2009-10-13 
07:52:23 UTC (rev 289611)
+++ php/php-src/branches/PHP_5_3/ext/date/lib/timezonedb.h  2009-10-13 
08:16:35 UTC (rev 289612)
@@ -8144,7 +8144,7 @@
 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x16, 0x89, 
0x7E, 0xFC, 0xA4,
 0xCC, 0x95, 0x32, 0xA8, 0xD2, 0x74, 0x12, 0x98, 0xDD, 0xA8, 0xE0, 0xA8, 0x02, 
0x4F, 0xAB, 0x30,
 0x3C, 0xAF, 0x45, 0xEC, 0x3D, 0x9F, 0x28, 0xDC, 0x48, 0x41, 0xA0, 0x30, 0x49, 
0x0B, 0x47, 0xA0,
-0x49, 0xE4, 0xDD, 0x30, 0x4A, 0xEC, 0x7B, 0x20, 0x01, 0x02, 0x01, 0x03, 0x05, 
0x04, 0x05, 0x04,
+0x49, 0xE4, 0xDD, 0x30, 0x4A, 0xC3, 0x9C, 0xA0, 0x01, 0x02, 0x01, 0x03, 0x05, 
0x04, 0x05, 0x04,
 0x05, 0x04, 0x05, 0x00, 0x00, 0x3E, 0xDC, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x58, 
0x00, 0x04, 0x00,
 0x00, 0x5B, 0x68, 0x01, 0x04, 0x00, 0x00, 0x46, 0x50, 0x00, 0x08, 0x00, 0x00, 
0x54, 0x60, 0x01,
 0x0D, 0x00, 0x00, 0x46, 0x50, 0x00, 0x12, 0x4C, 0x4D, 0x54, 0x00, 0x49, 0x53, 
0x54, 0x00, 0x4B,
@@ -18095,4 +18095,4 @@
 0x00, 0x00, 0x55, 0x54, 0x43, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 
0x12, 0xA8, 0x80,
 0x00, 0x00, 0x00, 0x00, };

-const timelib_tzdb timezonedb_builtin = { 2009.13, 560, 
timezonedb_idx_builtin, timelib_timezone_db_data_builtin };
+const timelib_tzdb timezonedb_builtin = { 2009.14, 560, 
timezonedb_idx_builtin, timelib_timezone_db_data_builtin };

Modified: php/php-src/trunk/ext/date/lib/timezonedb.h
===
--- php/php-src/trunk/ext/date/lib/timezonedb.h 2009-10-13 07:52:23 UTC (rev 
289611)
+++ php/php-src/trunk/ext/date/lib/timezonedb.h 2009-10-13 08:16:35 UTC (rev 
289612)
@@ -8144,7 +8144,7 @@
 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x16, 0x89, 
0x7E, 0xFC, 0xA4,
 0xCC, 0x95, 0x32, 0xA8, 0xD2, 0x74, 0x12, 0x98, 0xDD, 0xA8, 0xE0, 0xA8, 0x02, 
0x4F, 0xAB, 0x30,
 0x3C, 0xAF, 0x45, 0xEC, 0x3D, 0x9F, 0x28, 0xDC, 0x48, 0x41, 0xA0, 0x30, 0x49, 
0x0B, 0x47, 0xA0,
-0x49, 0xE4, 0xDD, 0x30, 0x4A, 0xEC, 0x7B, 0x20, 0x01, 0x02, 0x01, 0x03, 0x05, 
0x04, 0x05, 0x04,
+0x49, 0xE4, 0xDD, 0x30, 0x4A, 0xC3, 0x9C, 0xA0, 0x01, 0x02, 0x01, 0x03, 0x05, 
0x04, 0x05, 0x04,
 0x05, 0x04, 0x05, 0x00, 0x00, 0x3E, 0xDC, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x58, 
0x00, 0x04, 0x00,
 0x00, 0x5B, 0x68, 0x01, 0x04, 0x00, 0x00, 0x46, 0x50, 0x00, 0x08, 0x00, 0x00, 
0x54, 0x60, 0x01,
 0x0D, 0x00, 0x00, 0x46, 0x50, 0x00, 0x12, 0x4C, 0x4D, 0x54, 0x00, 0x49, 0x53, 
0x54, 0x00, 0x4B,
@@ -18095,4 +18095,4 @@
 0x00, 0x00, 0x55, 0x54, 0x43, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 
0x12, 0xA8, 0x80,
 0x00, 0x00, 0x00, 0x00, };

-const timelib_tzdb timezonedb_builtin = { 2009.13, 560, 
timezonedb_idx_builtin, timelib_timezone_db_data_builtin };
+const timelib_tzdb timezonedb_builtin = { 2009.14, 560, 
timezonedb_idx_builtin, timelib_timezone_db_data_builtin };

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit:

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/main/main.c trunk/main/main.c

2009-10-13 Thread Stanislav Malyshev

stas Tue, 13 Oct 2009 19:58:59 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=289621

Log:
fix crash for bug #47627

Bug: http://bugs.php.net/47627 (Bogus) No input file specified causing crash
  
Changed paths:
U   php/php-src/branches/PHP_5_3/main/main.c
U   php/php-src/trunk/main/main.c

Modified: php/php-src/branches/PHP_5_3/main/main.c
===
--- php/php-src/branches/PHP_5_3/main/main.c2009-10-13 18:39:00 UTC (rev 
289620)
+++ php/php-src/branches/PHP_5_3/main/main.c2009-10-13 19:58:59 UTC (rev 
289621)
@@ -649,6 +649,10 @@
char *message;
int is_function = 0;

+   if(!ZEND_CAN_REPORT(type)) {
+   return;
+   }
+
/* get error text into buffer and escape for html if necessary */
buffer_len = vspprintf(buffer, 0, format, args);
if (PG(html_errors)) {
@@ -836,6 +840,9 @@
char *params;
va_list args;

+   if(!ZEND_CAN_REPORT(type)) {
+   return;
+   }
spprintf(params, 0, %s,%s, param1, param2);
va_start(args, format);
php_verror(docref, params ? params : ..., type, format, args 
TSRMLS_CC);
@@ -2164,7 +2171,9 @@
char realfile[MAXPATHLEN];

 #ifdef PHP_WIN32
-   UpdateIniFromRegistry(primary_file-filename TSRMLS_CC);
+   if(primary_file-filename) {
+   UpdateIniFromRegistry(primary_file-filename TSRMLS_CC);
+   }
 #endif

PG(during_request_startup) = 0;
@@ -2254,7 +2263,9 @@

zend_try {
 #ifdef PHP_WIN32
-   UpdateIniFromRegistry(primary_file-filename TSRMLS_CC);
+   if(primary_file-filename) {
+   UpdateIniFromRegistry(primary_file-filename TSRMLS_CC);
+   }
 #endif

PG(during_request_startup) = 0;

Modified: php/php-src/trunk/main/main.c
===
--- php/php-src/trunk/main/main.c   2009-10-13 18:39:00 UTC (rev 289620)
+++ php/php-src/trunk/main/main.c   2009-10-13 19:58:59 UTC (rev 289621)
@@ -2283,7 +2283,9 @@
char realfile[MAXPATHLEN];

 #ifdef PHP_WIN32
-   UpdateIniFromRegistry(primary_file-filename TSRMLS_CC);
+   if(primary_file-filename) {
+   UpdateIniFromRegistry(primary_file-filename TSRMLS_CC);
+   }
 #endif

PG(during_request_startup) = 0;
@@ -2372,7 +2374,9 @@

zend_try {
 #ifdef PHP_WIN32
-   UpdateIniFromRegistry(primary_file-filename TSRMLS_CC);
+   if(primary_file-filename) {
+   UpdateIniFromRegistry(primary_file-filename TSRMLS_CC);
+   }
 #endif

PG(during_request_startup) = 0;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/registry.c trunk/win32/registry.c

2009-10-13 Thread Stanislav Malyshev

stas Tue, 13 Oct 2009 20:10:07 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=289622

Log:
add safeguard for UpdateIniFromRegistry on NULL arg

Changed paths:
U   php/php-src/branches/PHP_5_3/win32/registry.c
U   php/php-src/trunk/win32/registry.c

Modified: php/php-src/branches/PHP_5_3/win32/registry.c
===
--- php/php-src/branches/PHP_5_3/win32/registry.c   2009-10-13 19:58:59 UTC 
(rev 289621)
+++ php/php-src/branches/PHP_5_3/win32/registry.c   2009-10-13 20:10:07 UTC 
(rev 289622)
@@ -168,6 +168,10 @@
int path_len;
HashTable **pht;

+   if(!path) {
+   return;
+   }
+
if (!PW32G(registry_directories)) {
PW32G(registry_directories) = 
(HashTable*)malloc(sizeof(HashTable));
zend_hash_init(PW32G(registry_directories), 0, NULL, 
delete_internal_hashtable, 1);

Modified: php/php-src/trunk/win32/registry.c
===
--- php/php-src/trunk/win32/registry.c  2009-10-13 19:58:59 UTC (rev 289621)
+++ php/php-src/trunk/win32/registry.c  2009-10-13 20:10:07 UTC (rev 289622)
@@ -168,6 +168,10 @@
int path_len;
HashTable **pht;

+   if(!path) {
+   return;
+   }
+
if (!PW32G(registry_directories)) {
PW32G(registry_directories) = 
(HashTable*)malloc(sizeof(HashTable));
zend_hash_init(PW32G(registry_directories), 0, NULL, 
delete_internal_hashtable, 1);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/main/ main.c

2009-10-13 Thread Stanislav Malyshev

stas Tue, 13 Oct 2009 20:54:28 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=289623

Log:
oops, that doesn't belong to this patch

Changed paths:
U   php/php-src/branches/PHP_5_3/main/main.c

Modified: php/php-src/branches/PHP_5_3/main/main.c
===
--- php/php-src/branches/PHP_5_3/main/main.c2009-10-13 20:10:07 UTC (rev 
289622)
+++ php/php-src/branches/PHP_5_3/main/main.c2009-10-13 20:54:28 UTC (rev 
289623)
@@ -649,10 +649,6 @@
char *message;
int is_function = 0;

-   if(!ZEND_CAN_REPORT(type)) {
-   return;
-   }
-
/* get error text into buffer and escape for html if necessary */
buffer_len = vspprintf(buffer, 0, format, args);
if (PG(html_errors)) {
@@ -840,9 +836,6 @@
char *params;
va_list args;

-   if(!ZEND_CAN_REPORT(type)) {
-   return;
-   }
spprintf(params, 0, %s,%s, param1, param2);
va_start(args, format);
php_verror(docref, params ? params : ..., type, format, args 
TSRMLS_CC);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/standard/exec.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/exec.c trunk/ext/standard/exec.c

2009-10-13 Thread Ilia Alshanetsky

iliaaWed, 14 Oct 2009 01:32:07 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=289624

Log:
Fixed bug #49847 (exec() fails to return data inside 2nd parameter, given 
output lines 4095 bytes).

Bug: http://bugs.php.net/49847 (Analyzed) exec() confused by a specially 
crafted string
  
Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS
U   php/php-src/branches/PHP_5_2/ext/standard/exec.c
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/standard/exec.c
U   php/php-src/trunk/ext/standard/exec.c

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-10-13 20:54:28 UTC (rev 289623)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-10-14 01:32:07 UTC (rev 289624)
@@ -10,6 +10,8 @@
 - Fixed crash when instantiating PDORow and PDOStatement through Reflection.
   (Felipe)

+- Fixed bug #49847 (exec() fails to return data inside 2nd parameter, given
+  output lines 4095 bytes). (Ilia)
 - Fixed bug #49809 (time_sleep_until() is not available on OpenSolaris). (Jani)
 - Fixed Bug #49785 (insufficient input string validation of 
htmlspecialchars()).
   (Moriyoshi, hello at iwamot dot com)

Modified: php/php-src/branches/PHP_5_2/ext/standard/exec.c
===
--- php/php-src/branches/PHP_5_2/ext/standard/exec.c2009-10-13 20:54:28 UTC 
(rev 289623)
+++ php/php-src/branches/PHP_5_2/ext/standard/exec.c2009-10-14 01:32:07 UTC 
(rev 289624)
@@ -62,7 +62,7 @@
 {
FILE *fp;
char *buf, *tmp=NULL;
-   int l, pclose_return;
+   int l = 0, pclose_return;
char *cmd_p, *b, *c, *d=NULL;
php_stream *stream;
size_t buflen, bufl = 0;
@@ -154,13 +154,16 @@
}
if (bufl) {
/* strip trailing whitespaces if we have not done so 
already */
-   if (type != 2) {
+   if ((type == 2  bufl  !l) || type != 2) {
l = bufl;
while (l--  isspace(((unsigned char 
*)buf)[l]));
if (l != (int)(bufl - 1)) {
bufl = l + 1;
buf[bufl] = '\0';
}
+   if (type == 2) {
+   add_next_index_stringl(array, buf, 
bufl, 1);
+   }
}

/* Return last line from the shell command */

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-10-13 20:54:28 UTC (rev 289623)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-10-14 01:32:07 UTC (rev 289624)
@@ -19,6 +19,8 @@
 - Fixed crash when instantiating PDORow and PDOStatement through Reflection.
   (Felipe)

+- Fixed bug #49847 (exec() fails to return data inside 2nd parameter, given
+  output lines 4095 bytes). (Ilia)
 - Fixed bug #49809 (time_sleep_until() is not available on OpenSolaris). (Jani)
 - Fixed bug #49800 (SimpleXML allow (un)serialize() calls without warning).
   (Ilia, wmeler at wp-sa dot pl)

Modified: php/php-src/branches/PHP_5_3/ext/standard/exec.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/exec.c2009-10-13 20:54:28 UTC 
(rev 289623)
+++ php/php-src/branches/PHP_5_3/ext/standard/exec.c2009-10-14 01:32:07 UTC 
(rev 289624)
@@ -62,7 +62,7 @@
 {
FILE *fp;
char *buf, *tmp=NULL;
-   int l, pclose_return;
+   int l = 0, pclose_return;
char *cmd_p, *b, *c, *d=NULL;
php_stream *stream;
size_t buflen, bufl = 0;
@@ -157,13 +157,16 @@
}
if (bufl) {
/* strip trailing whitespaces if we have not done so 
already */
-   if (type != 2) {
+   if ((type == 2  bufl  !l) || type != 2) {
l = bufl;
while (l--  isspace(((unsigned char 
*)buf)[l]));
if (l != (int)(bufl - 1)) {
bufl = l + 1;
buf[bufl] = '\0';
}
+   if (type == 2) {
+   add_next_index_stringl(array, buf, 
bufl, 1);
+   }
}

/* Return last line from the shell command */

Modified: php/php-src/trunk/ext/standard/exec.c
===
--- php/php-src/trunk/ext/standard/exec.c   2009-10-13 20:54:28 UTC (rev 
289623)
+++

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/date/lib/timezonedb.h branches/PHP_5_3/ext/date/lib/timezonedb.h trunk/ext/date/lib/timezonedb.h

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/main/main.c trunk/main/main.c

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/registry.c trunk/win32/registry.c

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/main/ main.c

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/standard/exec.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/exec.c trunk/ext/standard/exec.c

5 matches

Site Navigation

Mail list logo

Footer information