com php-src: Fix #65550: get_browser() incorrectly pa rsers entries with "+" sign: NEWS ext/standar d/browscap.c ext/standard/tests/misc/bug65550.p
hpt

Commit: 2139918ea6f5088e9ed5daa734568b4a50217f52 Author: Christoph M. Becker <cmbecker69@gmx.de> Sat, 27 Aug 2016 01:02:58 +0200 Parents: 84512a117789563a64172115c648944538006a69 Branches: PHP-5.6 PHP-7..0 PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2139918ea6f5088e9ed5daa734568b4a50217f52 Log: Fix #65550: get_browser() incorrectly parsers entries with "+" sign + signs in the browscap patterns are meant to be literal characters, so we have to escape them for the regex matching. Bugs: https://bugs.php.net/65550 Changed paths: M NEWS M ext/standard/browscap.c A ext/standard/tests/misc/bug65550.phpt Diff: diff --git a/NEWS b/NEWS index a7a58b6..fcb811f 100644 --- a/NEWS +++ b/NEWS @@ -44,6 +44,8 @@ PHP NEWS - Standard: . Fixed bug #72823 (strtr out-of-bound access).. (cmb) . Fixed bug #72278 (getimagesize returning FALSE on valid jpg).. (cmb) + . Fixed bug #65550 (get_browser() incorrectly parses entries with "+" sign). + (cmb) - XML: . Fixed bug #72085 (SEGV on unknown address zif_xml_parse). (cmb) diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c index 2b75135..36def71 100644 --- a/ext/standard/browscap.c +++ b/ext/standard/browscap.c @@ -123,6 +123,10 @@ static void convert_browscap_pattern(zval *pattern, int persistent) /* {{{ */ t[j++] = '\\'; t[j] = '~'; break; + case '+': + t[j++] = '\\'; + t[j] = '+'; + break; default: t[j] = Z_STRVAL_P(pattern)[i]; break; diff --git a/ext/standard/tests/misc/bug65550.phpt b/ext/standard/tests/misc/bug65550.phpt new file mode 100644 index 0000000..4196742 --- /dev/null +++ b/ext/standard/tests/misc/bug65550.phpt @@ -0,0 +1,19 @@ +--TEST-- +Bug #65550 (get_browser() incorrectly parses entries with "+" sign) +--INI-- +browscap={PWD}/browscap.ini +--SKIPIF-- +<?php +if (!is_readable(ini_get('browscap'))) die('skip browscap.ini file ' . ini_get('browscap') . ' not readable'); +?> +--FILE-- +<?php +$user_agent = 'Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-US) AppleWebKit/522+ (KHTML, like Gecko, Safari/522) OmniWeb/v613'; +$caps = get_browser($user_agent, true); +var_dump($caps['browser'], $caps['version']); +?> +==DONE== +--EXPECT-- +string(7) "OmniWeb" +string(3) "5.6" +==DONE==