MFH? (Ilia...you should be doing this..)
--Jani
On Thu, 26 Jun 2003, Sterling Hughes wrote:
>sterling Wed Jun 25 23:24:11 2003 EDT
>
> Modified files:
> /php-src/ext/standard var_unserializer.c var_unserializer.re
> Log:
> fix by ilia to fix crashes in the session extension when /tmp/sess_* files
> previously existed. make test now passes fully with the session extension.
>
>
>Index: php-src/ext/standard/var_unserializer.c
>diff -u php-src/ext/standard/var_unserializer.c:1.25
>php-src/ext/standard/var_unserializer.c:1.26
>--- php-src/ext/standard/var_unserializer.c:1.25 Tue Jun 10 16:03:39 2003
>+++ php-src/ext/standard/var_unserializer.c Wed Jun 25 23:24:11 2003
>@@ -1,5 +1,5 @@
>-/* Generated by re2c 0.5 on Sat May 24 19:11:12 2003 */
>-#line 1 "/usr/src/php5/ext/standard/var_unserializer.re"
>+/* Generated by re2c 0.5 on Wed Jun 25 23:00:04 2003 */
>+#line 1 "/home/rei/PHP_CVS/php-src/ext/standard/var_unserializer.re"
> /*
> +----------------------------------------------------------------------+
> | PHP Version 4 |
>@@ -18,7 +18,7 @@
> +----------------------------------------------------------------------+
> */
>
>-/* $Id: var_unserializer.c,v 1.25 2003/06/10 20:03:39 imajes Exp $ */
>+/* $Id: var_unserializer.c,v 1.26 2003/06/26 03:24:11 sterling Exp $ */
>
> #include "php.h"
> #include "ext/standard/php_var.h"
>@@ -339,7 +339,7 @@
> yych = *(YYMARKER = ++YYCURSOR);
> if(yych == ':') goto yy74;
> yy4:
>-#line 441
>+#line 440
> { return 0; }
> yy5: yych = *++YYCURSOR;
> if(yych == ';') goto yy72;
>@@ -374,7 +374,7 @@
> goto yy4;
> yy13: yych = *++YYCURSOR;
> yy14:
>-#line 435
>+#line 434
> {
> /* this is the case where we have less data than planned */
> php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unexpected end of serialized
> data");
>@@ -398,7 +398,7 @@
> if(yych != '"') goto yy2;
> yy21: yych = *++YYCURSOR;
> yy22:
>-#line 350
>+#line 349
> {
> int len;
> int elements;
>@@ -505,7 +505,7 @@
> if(yych != '"') goto yy2;
> yy28: yych = *++YYCURSOR;
> yy29:
>-#line 342
>+#line 341
> {
>
> INIT_PZVAL(*rval);
>@@ -535,7 +535,7 @@
> if(yych != '{') goto yy2;
> yy35: yych = *++YYCURSOR;
> yy36:
>-#line 324
>+#line 323
> {
> int elements = parse_iv(start + 2);
>
>@@ -575,7 +575,7 @@
> if(yych != '"') goto yy2;
> yy42: yych = *++YYCURSOR;
> yy43:
>-#line 304
>+#line 303
> {
> int len;
> char *str;
>@@ -652,7 +652,7 @@
> }
> yy51: yych = *++YYCURSOR;
> yy52:
>-#line 297
>+#line 296
> {
> *p = YYCURSOR;
> INIT_PZVAL(*rval);
>@@ -725,7 +725,7 @@
> if(yych != ';') goto yy2;
> yy64: yych = *++YYCURSOR;
> yy65:
>-#line 290
>+#line 289
> {
> *p = YYCURSOR;
> INIT_PZVAL(*rval);
>@@ -752,7 +752,7 @@
> if(yych != ';') goto yy2;
> yy70: yych = *++YYCURSOR;
> yy71:
>-#line 283
>+#line 282
> {
> *p = YYCURSOR;
> INIT_PZVAL(*rval);
>@@ -761,7 +761,7 @@
> }
> yy72: yych = *++YYCURSOR;
> yy73:
>-#line 276
>+#line 275
> {
> *p = YYCURSOR;
> INIT_PZVAL(*rval);
>@@ -800,7 +800,6 @@
> return 0;
> }
>
>- zval_ptr_dtor(rval);
> *rval = *rval_ref;
> (*rval)->refcount++;
> (*rval)->is_ref = 1;
>@@ -808,7 +807,7 @@
> return 1;
> }
> }
>-#line 443
>+#line 442
>
>
> return 0;
>Index: php-src/ext/standard/var_unserializer.re
>diff -u php-src/ext/standard/var_unserializer.re:1.17
>php-src/ext/standard/var_unserializer.re:1.18
>--- php-src/ext/standard/var_unserializer.re:1.17 Tue Jun 10 16:03:39 2003
>+++ php-src/ext/standard/var_unserializer.re Wed Jun 25 23:24:11 2003
>@@ -16,7 +16,7 @@
> +----------------------------------------------------------------------+
> */
>
>-/* $Id: var_unserializer.re,v 1.17 2003/06/10 20:03:39 imajes Exp $ */
>+/* $Id: var_unserializer.re,v 1.18 2003/06/26 03:24:11 sterling Exp $ */
>
> #include "php.h"
> #include "ext/standard/php_var.h"
>@@ -265,7 +265,6 @@
> return 0;
> }
>
>- zval_ptr_dtor(rval);
> *rval = *rval_ref;
> (*rval)->refcount++;
> (*rval)->is_ref = 1;
>
>
>
>
--
https://www.paypal.com/xclick/[EMAIL PROTECTED]&no_note=1&tax=0¤cy_code=EUR
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
