]> granicus.if.org Git - php/commitdiff
Fix crash if %> is encountered in HTML while ASP-tags are disabled
authorZeev Suraski <zeev@php.net>
Wed, 17 May 2000 15:50:30 +0000 (15:50 +0000)
committerZeev Suraski <zeev@php.net>
Wed, 17 May 2000 15:50:30 +0000 (15:50 +0000)
Zend/zend-scanner.l

index b7d0e1fba993ca58d58818d78bd25f32d21402da..44b80b9dfe0b6b28b9f2d6cbba1fcd553ebd7c3a 100644 (file)
@@ -1316,14 +1316,15 @@ ESCAPED_AND_WHITESPACE [\n\t\r #'.:;,()|^&+-/*=%!~<>?@]+
 
 
 <ST_IN_SCRIPTING>"%>"([\n]|"\r\n")? {
-       zendlval->value.str.val = yytext; /* no copying - intentional */
        zendlval->value.str.len = yyleng;
        zendlval->type = IS_STRING;
        HANDLE_NEWLINES(yytext,yyleng);
        if (CG(asp_tags)) {
                BEGIN(INITIAL);
+               zendlval->value.str.val = yytext; /* no copying - intentional */
                return T_CLOSE_TAG;  /* implicit ';' at php-end tag */
        } else {
+               zendlval->value.str.val = (char *) estrndup(yytext, yyleng);
                return T_INLINE_HTML;
        }
 }