subject:"\[PHP\-CVS\] cvs\: php\-src\(PHP_5_3\) \/ext\/standard var_unserializer.c var

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard var_unserializer.c var_unserializer.re

2009-03-17 Thread Felipe Pena

felipe  Tue Mar 17 23:07:40 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   var_unserializer.c var_unserializer.re 
  Log:
  - MFH: Year++
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.c?r1=1.70.2.4.2.7.2.9&r2=1.70.2.4.2.7.2.10&diff_format=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.70.2.4.2.7.2.9 
php-src/ext/standard/var_unserializer.c:1.70.2.4.2.7.2.10
--- php-src/ext/standard/var_unserializer.c:1.70.2.4.2.7.2.9Tue Mar 17 
22:04:10 2009
+++ php-src/ext/standard/var_unserializer.c Tue Mar 17 23:07:40 2009
@@ -4,7 +4,7 @@
   +--+
   | PHP Version 5|
   +--+
-  | Copyright (c) 1997-2006 The PHP Group|
+  | Copyright (c) 1997-2009 The PHP Group|
   +--+
   | This source file is subject to version 3.01 of the PHP license,  |
   | that is bundled with this package in the file LICENSE, and is|
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: var_unserializer.c,v 1.70.2.4.2.7.2.9 2009/03/17 22:04:10 mattwil Exp 
$ */
+/* $Id: var_unserializer.c,v 1.70.2.4.2.7.2.10 2009/03/17 23:07:40 felipe Exp 
$ */
 
 #include "php.h"
 #include "ext/standard/php_var.h"
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.re?r1=1.52.2.2.2.6.2.8&r2=1.52.2.2.2.6.2.9&diff_format=u
Index: php-src/ext/standard/var_unserializer.re
diff -u php-src/ext/standard/var_unserializer.re:1.52.2.2.2.6.2.8 
php-src/ext/standard/var_unserializer.re:1.52.2.2.2.6.2.9
--- php-src/ext/standard/var_unserializer.re:1.52.2.2.2.6.2.8   Tue Mar 17 
22:04:10 2009
+++ php-src/ext/standard/var_unserializer.reTue Mar 17 23:07:40 2009
@@ -2,7 +2,7 @@
   +--+
   | PHP Version 5|
   +--+
-  | Copyright (c) 1997-2006 The PHP Group|
+  | Copyright (c) 1997-2009 The PHP Group|
   +--+
   | This source file is subject to version 3.01 of the PHP license,  |
   | that is bundled with this package in the file LICENSE, and is|
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: var_unserializer.re,v 1.52.2.2.2.6.2.8 2009/03/17 22:04:10 mattwil Exp 
$ */
+/* $Id: var_unserializer.re,v 1.52.2.2.2.6.2.9 2009/03/17 23:07:40 felipe Exp 
$ */
 
 #include "php.h"
 #include "ext/standard/php_var.h"



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard var_unserializer.c var_unserializer.re /ext/standard/tests/serialize bug46882.phpt

2009-03-17 Thread Matt Wilmas

mattwil Tue Mar 17 22:04:10 2009 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/serialize   bug46882.phpt 

  Modified files:  
/php-src/ext/standard   var_unserializer.c var_unserializer.re 
  Log:
  MFH: Fixed bug #46882 (Serialize / Unserialize misbehaviour under OS with 
different bit numbers)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.c?r1=1.70.2.4.2.7.2.8&r2=1.70.2.4.2.7.2.9&diff_format=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.70.2.4.2.7.2.8 
php-src/ext/standard/var_unserializer.c:1.70.2.4.2.7.2.9
--- php-src/ext/standard/var_unserializer.c:1.70.2.4.2.7.2.8Tue Nov  4 
15:58:55 2008
+++ php-src/ext/standard/var_unserializer.c Tue Mar 17 22:04:10 2009
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.6.dev on Tue Nov  4 01:37:59 2008 */
+/* Generated by re2c 0.13.5 on Tue Mar 17 15:55:10 2009 */
 #line 1 "ext/standard/var_unserializer.re"
 /*
   +--+
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: var_unserializer.c,v 1.70.2.4.2.7.2.8 2008/11/04 15:58:55 helly Exp $ 
*/
+/* $Id: var_unserializer.c,v 1.70.2.4.2.7.2.9 2009/03/17 22:04:10 mattwil Exp 
$ */
 
 #include "php.h"
 #include "ext/standard/php_var.h"
@@ -456,7 +456,7 @@
yych = *(YYMARKER = ++YYCURSOR);
if (yych == ':') goto yy95;
 yy3:
-#line 699 "ext/standard/var_unserializer.re"
+#line 722 "ext/standard/var_unserializer.re"
{ return 0; }
 #line 462 "ext/standard/var_unserializer.c"
 yy4:
@@ -501,7 +501,7 @@
goto yy3;
 yy14:
++YYCURSOR;
-#line 693 "ext/standard/var_unserializer.re"
+#line 716 "ext/standard/var_unserializer.re"
{
/* this is the case where we have less data than planned */
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unexpected end of 
serialized data");
@@ -537,7 +537,7 @@
yych = *++YYCURSOR;
if (yych != '"') goto yy18;
++YYCURSOR;
-#line 576 "ext/standard/var_unserializer.re"
+#line 599 "ext/standard/var_unserializer.re"
{
size_t len, len2, len3, maxlen;
long elements;
@@ -679,7 +679,7 @@
yych = *++YYCURSOR;
if (yych != '"') goto yy18;
++YYCURSOR;
-#line 568 "ext/standard/var_unserializer.re"
+#line 591 "ext/standard/var_unserializer.re"
{
 
INIT_PZVAL(*rval);
@@ -708,7 +708,7 @@
yych = *++YYCURSOR;
if (yych != '{') goto yy18;
++YYCURSOR;
-#line 548 "ext/standard/var_unserializer.re"
+#line 571 "ext/standard/var_unserializer.re"
{
long elements = parse_iv(start + 2);
/* use iv() not uiv() in order to check data range */
@@ -749,7 +749,7 @@
yych = *++YYCURSOR;
if (yych != '"') goto yy18;
++YYCURSOR;
-#line 519 "ext/standard/var_unserializer.re"
+#line 542 "ext/standard/var_unserializer.re"
{
size_t len, maxlen;
char *str;
@@ -799,7 +799,7 @@
yych = *++YYCURSOR;
if (yych != '"') goto yy18;
++YYCURSOR;
-#line 491 "ext/standard/var_unserializer.re"
+#line 514 "ext/standard/var_unserializer.re"
{
size_t len, maxlen;
char *str;
@@ -915,14 +915,17 @@
}
 yy63:
++YYCURSOR;
-#line 484 "ext/standard/var_unserializer.re"
+#line 504 "ext/standard/var_unserializer.re"
{
+#if SIZEOF_LONG == 4
+use_double:
+#endif
*p = YYCURSOR;
INIT_PZVAL(*rval);
ZVAL_DOUBLE(*rval, zend_strtod((const char *)start + 2, NULL));
return 1;
 }
-#line 926 "ext/standard/var_unserializer.c"
+#line 929 "ext/standard/var_unserializer.c"
 yy65:
yych = *++YYCURSOR;
if (yych <= ',') {
@@ -981,7 +984,7 @@
yych = *++YYCURSOR;
if (yych != ';') goto yy18;
++YYCURSOR;
-#line 469 "ext/standard/var_unserializer.re"
+#line 489 "ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
@@ -996,7 +999,7 @@
 
return 1;
 }
-#line 1000 "ext/standard/var_unserializer.c"
+#line 1003 "ext/standard/var_unserializer.c"
 yy76:
yych = *++YYCURSOR;
if (yych == 'N') goto yy73;
@@ -1025,12 +1028,32 @@
++YYCURSOR;
 #line 462 "ext/standard/var_unserializer.re"
{
+#if SIZEOF_LONG == 4
+   int digits = YYCURSOR - start - 3;
+
+   if (start[2] == '-' || start[2] == '+') {
+   digits--;
+   }
+
+   /* Use double for large long values that were serialized on a 64-bit 
system */
+   if (digits >= MAX_LENGTH_OF_LONG - 1) {
+   if (digits == MAX_LENGTH_OF_LONG - 1) {
+   int cmp = strncmp(YYCURSOR - MAX_LENGTH_OF_LONG, 
long_min_digits, MAX_LENGTH_OF_LONG - 1);
+
+   if (!(cmp < 0 || (cmp == 0 && start[2] == '-'))) {
+   goto use_double;
+

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard var_unserializer.c var_unserializer.re /ext/standard/tests/array array_push_error2.phpt /ext/standard/tests/serialize bug43614.phpt

2008-03-18 Thread Felipe Pena

felipe  Wed Mar 19 03:05:35 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/serialize   bug43614.phpt 

  Modified files:  
/php-src/ext/standard   var_unserializer.c var_unserializer.re 
/php-src/ext/standard/tests/array   array_push_error2.phpt 
  Log:
  MFB: Fixed bug #43614 (incorrect processing of numerical string keys of array 
in arbitrary serialized data)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.c?r1=1.70.2.4.2.7.2.3&r2=1.70.2.4.2.7.2.4&diff_format=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.70.2.4.2.7.2.3 
php-src/ext/standard/var_unserializer.c:1.70.2.4.2.7.2.4
--- php-src/ext/standard/var_unserializer.c:1.70.2.4.2.7.2.3Wed Oct 17 
10:36:33 2007
+++ php-src/ext/standard/var_unserializer.c Wed Mar 19 03:05:34 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: var_unserializer.c,v 1.70.2.4.2.7.2.3 2007/10/17 10:36:33 dmitry Exp $ 
*/
+/* $Id: var_unserializer.c,v 1.70.2.4.2.7.2.4 2008/03/19 03:05:34 felipe Exp $ 
*/
 
 #include "php.h"
 #include "ext/standard/php_var.h"
@@ -290,10 +290,10 @@
zend_hash_index_update(ht, Z_LVAL_P(key), 
&data, sizeof(data), NULL);
break;
case IS_STRING:
-   if (zend_hash_find(ht, Z_STRVAL_P(key), 
Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) {
+   if (zend_symtable_find(ht, Z_STRVAL_P(key), 
Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) {
var_push_dtor(var_hash, old_data);
}
-   zend_hash_update(ht, Z_STRVAL_P(key), 
Z_STRLEN_P(key) + 1, &data, sizeof(data), NULL);
+   zend_symtable_update(ht, Z_STRVAL_P(key), 
Z_STRLEN_P(key) + 1, &data, sizeof(data), NULL);
break;
}

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.re?r1=1.52.2.2.2.6.2.3&r2=1.52.2.2.2.6.2.4&diff_format=u
Index: php-src/ext/standard/var_unserializer.re
diff -u php-src/ext/standard/var_unserializer.re:1.52.2.2.2.6.2.3 
php-src/ext/standard/var_unserializer.re:1.52.2.2.2.6.2.4
--- php-src/ext/standard/var_unserializer.re:1.52.2.2.2.6.2.3   Wed Oct 17 
10:36:33 2007
+++ php-src/ext/standard/var_unserializer.reWed Mar 19 03:05:34 2008
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: var_unserializer.re,v 1.52.2.2.2.6.2.3 2007/10/17 10:36:33 dmitry Exp 
$ */
+/* $Id: var_unserializer.re,v 1.52.2.2.2.6.2.4 2008/03/19 03:05:34 felipe Exp 
$ */
 
 #include "php.h"
 #include "ext/standard/php_var.h"
@@ -294,10 +294,10 @@
zend_hash_index_update(ht, Z_LVAL_P(key), 
&data, sizeof(data), NULL);
break;
case IS_STRING:
-   if (zend_hash_find(ht, Z_STRVAL_P(key), 
Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) {
+   if (zend_symtable_find(ht, Z_STRVAL_P(key), 
Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) {
var_push_dtor(var_hash, old_data);
}
-   zend_hash_update(ht, Z_STRVAL_P(key), 
Z_STRLEN_P(key) + 1, &data, sizeof(data), NULL);
+   zend_symtable_update(ht, Z_STRVAL_P(key), 
Z_STRLEN_P(key) + 1, &data, sizeof(data), NULL);
break;
}

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_push_error2.phpt?r1=1.1.4.3&r2=1.1.4.4&diff_format=u
Index: php-src/ext/standard/tests/array/array_push_error2.phpt
diff -u php-src/ext/standard/tests/array/array_push_error2.phpt:1.1.4.3 
php-src/ext/standard/tests/array/array_push_error2.phpt:1.1.4.4
--- php-src/ext/standard/tests/array/array_push_error2.phpt:1.1.4.3 Thu Feb 
14 16:29:45 2008
+++ php-src/ext/standard/tests/array/array_push_error2.phpt Wed Mar 19 
03:05:34 2008
@@ -1,5 +1,9 @@
 --TEST--
 Test array_push() function : error conditions - min and max int values as keys
+--SKIPIF--
+
 --FILE--
 
+  [-2147483647]=>
   string(3) "min"
-  [%d]=>
+  [2147483647]=>
   string(3) "max"
-  [-%d]=>
+  [-2147483648]=>
   string(3) "new"
 }
 
 Warning: array_push(): Cannot add element to the array as the next element is 
already occupied in %s on line %d
 bool(false)
 array(3) {
-  [-%d]=>
+  [-2147483647]=>
   string(3) "min"
-  [%d]=>
+  [2147483647]=>
   string(3) "max"
-  [-%d]=>
+  [-2147483648]=>
   string(3) "new"
 }
-Done
\ No newline at end of file
+Done

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/bug43614.phpt?view=markup&rev=1.

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard var_unserializer.c var_unserializer.re

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard var_unserializer.c var_unserializer.re /ext/standard/tests/serialize bug46882.phpt

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard var_unserializer.c var_unserializer.re /ext/standard/tests/array array_push_error2.phpt /ext/standard/tests/serialize bug43614.phpt

3 matches

Site Navigation

Mail list logo

Footer information