diff options
author | Marcus Boerger <helly@php.net> | 2004-01-02 03:27:32 +0000 |
---|---|---|
committer | Marcus Boerger <helly@php.net> | 2004-01-02 03:27:32 +0000 |
commit | 0cd13bf423a8720f36c44388208667328f35840f (patch) | |
tree | a5157104f988e41f0867d4ca9271e0577d7df82f /ext/standard | |
parent | 3ab7b87143a0712bcac5bfe65dbe0b726be93f85 (diff) | |
download | php-git-0cd13bf423a8720f36c44388208667328f35840f.tar.gz |
Bugfix #26762 unserialize() produces lowercase classnames
Diffstat (limited to 'ext/standard')
-rw-r--r-- | ext/standard/var_unserializer.c | 16 | ||||
-rw-r--r-- | ext/standard/var_unserializer.re | 6 |
2 files changed, 5 insertions, 17 deletions
diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c index bf633b2256..7a85956802 100644 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@ -1,5 +1,5 @@ -/* Generated by re2c 0.5 on Wed Sep 3 19:23:11 2003 */ -#line 1 "/usr/src/web/php/php5/ext/standard/var_unserializer.re" +/* Generated by re2c 0.5 on Fri Jan 2 04:02:19 2004 */ +#line 1 "/usr/src/php5/ext/standard/var_unserializer.re" /* +----------------------------------------------------------------------+ | PHP Version 4 | @@ -341,7 +341,7 @@ yy3: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if(yych == ':') goto yy74; yy4: -#line 446 +#line 440 { return 0; } yy5: yych = *++YYCURSOR; if(yych == ';') goto yy72; @@ -376,7 +376,7 @@ yy12: yyaccept = 0; goto yy4; yy13: yych = *++YYCURSOR; yy14: -#line 440 +#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"); @@ -422,12 +422,6 @@ yy22: class_name = estrndup(YYCURSOR, len); YYCURSOR += len; - while (len-- > 0) { - if (class_name[len] >= 'A' && class_name[len] <= 'Z') { - class_name[len] = class_name[len] - 'A' + 'a'; - } - } - do { /* Try to find class directly */ if (zend_lookup_class(class_name, len2, &pce TSRMLS_CC) == SUCCESS) { @@ -803,7 +797,7 @@ yy79: return 1; } } -#line 448 +#line 442 return 0; diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re index 85a4998019..29bb6ed9aa 100644 --- a/ext/standard/var_unserializer.re +++ b/ext/standard/var_unserializer.re @@ -374,12 +374,6 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER) class_name = estrndup(YYCURSOR, len); YYCURSOR += len; - while (len-- > 0) { - if (class_name[len] >= 'A' && class_name[len] <= 'Z') { - class_name[len] = class_name[len] - 'A' + 'a'; - } - } - do { /* Try to find class directly */ if (zend_lookup_class(class_name, len2, &pce TSRMLS_CC) == SUCCESS) { |