From: Alexander Feldman Date: Wed, 11 Oct 2000 19:38:16 +0000 (+0000) Subject: Fixed a problem in the configuration scanner where two extra NULL bytes X-Git-Tag: php-4.0.4RC3~718 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aee3c65a8f58cedef14d1397c742ade93b4a79bc;p=php Fixed a problem in the configuration scanner where two extra NULL bytes were added to each encapsulated string. --- diff --git a/NEWS b/NEWS index 7d26ae60c2..a442173d78 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,8 @@ PHP 4.0 NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| 11 Oct 2000, Version 4.0.3 +- Fixed a problem in the configuration parser (two null bytes were added + to each ENCAPSULATED TC_STRING) (alex@zend.com) - Fixed a possible crash in -a interactive mode (Zeev, Zend Engine) - Added mysql_escape_string() (Peter A. Savitch and & Brian Wang) - Fixed many possible crash bugs with improper use of the printf() family of diff --git a/main/configuration-scanner.l b/main/configuration-scanner.l index 4958e7246e..4e90739d21 100644 --- a/main/configuration-scanner.l +++ b/main/configuration-scanner.l @@ -113,8 +113,8 @@ void init_cfg_scanner() /* eat leading " */ yytext++; - cfglval->value.str.val = zend_strndup(yytext,yyleng); - cfglval->value.str.len = yyleng; + cfglval->value.str.val = zend_strndup(yytext, yyleng - 2); + cfglval->value.str.len = yyleng - 2; cfglval->type = IS_STRING; return TC_ENCAPSULATED_STRING; }