From: Jay Smith Date: Mon, 15 Mar 2004 21:26:39 +0000 (+0000) Subject: Fixed bug #27291 (get_browser matches browscap.ini patterns incorrectly). X-Git-Tag: php-5.0.0RC1RC2~39 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=83b2d923f8e308161a96e217012bc49688750478;p=php Fixed bug #27291 (get_browser matches browscap.ini patterns incorrectly). --- diff --git a/NEWS b/NEWS index d6fa3a380e..9a063b0b65 100644 --- a/NEWS +++ b/NEWS @@ -53,6 +53,8 @@ PHP NEWS - Fixed bug #27535 (Problem with object freeing mechanism). (Dmitry) - Fixed bug #27504 (Visibility bugs in call_user_function()). (Dmitry) - Fixed bug #27338 (memory leak inside tsrm_virtual_cwd.c on win32). (Ilia) +- Fixed bug #27291 (get_browser matches browscap.ini patterns incorrectly). + (Jay) - Fixed bug #27287 (wddx segfaults during deserialization). (Moriyoshi) - Fixed bug #27263 (session extension crashes when unserializing referenced values / objects). (Moriyoshi) diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c index dc23fcc4dd..2baf3735b1 100644 --- a/ext/standard/browscap.c +++ b/ext/standard/browscap.c @@ -22,6 +22,7 @@ #include "php_regex.h" #include "php_browscap.h" #include "php_ini.h" +#include "php_string.h" #include "zend_globals.h" @@ -47,9 +48,13 @@ static void convert_browscap_pattern(zval *pattern) register int i, j; char *t; - t = (char *) malloc(Z_STRLEN_P(pattern)*2 + 1); + php_strtolower(Z_STRVAL_P(pattern), Z_STRLEN_P(pattern)); - for (i=0, j=0; i Z_STRLEN_PP(browser_name)) { + else if (!strcasecmp(Z_STRVAL_PP(previous_match), lookup_browser_name)) { return 0; } } - if (regcomp(&r, Z_STRVAL_PP(browser_name), REG_NOSUB)!=0) { + + + if (zend_hash_find(Z_ARRVAL_PP(browser), "browser_name_regex", sizeof("browser_name_regex"), (void **) &browser_regex) == FAILURE) { + return 0; + } + + if (regcomp(&r, Z_STRVAL_PP(browser_regex), REG_NOSUB)!=0) { return 0; } if (regexec(&r, lookup_browser_name, 0, NULL, 0)==0) { - *found_browser_entry = *browser; + /* If we've found a possible browser, we need to do a comparison of the + number of characters changed in the user agent being checked versus + the previous match found and the current match. */ + if (*found_browser_entry) { + int i, prev_len = 0, curr_len = 0, ua_len; + zval **current_match; + + if (zend_hash_find(Z_ARRVAL_PP(browser), "browser_name_pattern", sizeof("browser_name_pattern"), (void**) ¤t_match) == FAILURE) { + regfree(&r); + return 0; + } + + ua_len = strlen(lookup_browser_name); + + for (i = 0; i < Z_STRLEN_PP(previous_match); i++) { + switch (Z_STRVAL_PP(previous_match)[i]) { + case '?': + case '*': + /* do nothing, ignore these characters in the count */ + break; + + default: + ++prev_len; + } + } + + for (i = 0; i < Z_STRLEN_PP(current_match); i++) { + switch (Z_STRVAL_PP(current_match)[i]) { + case '?': + case '*': + /* do nothing, ignore these characters in the count */ + break; + + default: + ++curr_len; + } + } + + + /* Pick which browser pattern replaces the least amount of + characters when compared to the original user agent string... */ + if (ua_len - prev_len > ua_len - curr_len) { + *found_browser_entry = *browser; + } + } + else { + *found_browser_entry = *browser; + } + } + + if (&r) { + regfree(&r); } - regfree(&r); + return 0; } /* }}} */ @@ -235,7 +291,7 @@ PHP_FUNCTION(get_browser) if (ZEND_NUM_ARGS() > 2 || zend_get_parameters_ex(ZEND_NUM_ARGS(), &agent_name, &retarr) == FAILURE) { ZEND_WRONG_PARAM_COUNT(); } - + if (agent_name == NULL || Z_TYPE_PP(agent_name) == IS_NULL) { zend_is_auto_global("_SERVER", sizeof("_SERVER")-1 TSRMLS_CC); if (!PG(http_globals)[TRACK_VARS_SERVER] @@ -246,20 +302,22 @@ PHP_FUNCTION(get_browser) } convert_to_string_ex(agent_name); + lookup_browser_name = estrndup(Z_STRVAL_PP(agent_name), Z_STRLEN_PP(agent_name)); + php_strtolower(lookup_browser_name, strlen(lookup_browser_name)); if (ZEND_NUM_ARGS() == 2) { convert_to_boolean_ex(retarr); return_array = Z_BVAL_PP(retarr); } - if (zend_hash_find(&browser_hash, Z_STRVAL_PP(agent_name), Z_STRLEN_PP(agent_name)+1, (void **) &agent)==FAILURE) { - lookup_browser_name = Z_STRVAL_PP(agent_name); + if (zend_hash_find(&browser_hash, lookup_browser_name, strlen(lookup_browser_name)+1, (void **) &agent)==FAILURE) { found_browser_entry = NULL; zend_hash_apply_with_arguments(&browser_hash, (apply_func_args_t) browser_reg_compare, 2, lookup_browser_name, &found_browser_entry); if (found_browser_entry) { agent = &found_browser_entry; } else if (zend_hash_find(&browser_hash, DEFAULT_SECTION_NAME, sizeof(DEFAULT_SECTION_NAME), (void **) &agent)==FAILURE) { + efree(lookup_browser_name); RETURN_FALSE; } } @@ -285,6 +343,10 @@ PHP_FUNCTION(get_browser) zend_hash_merge(Z_OBJPROP_P(return_value), Z_ARRVAL_PP(agent), (copy_ctor_func_t) zval_add_ref, (void *) &tmp_copy, sizeof(zval *), 0); } } + + if (lookup_browser_name) { + efree(lookup_browser_name); + } } /* }}} */