From: Stanislav Malyshev Date: Sun, 23 Jul 2000 11:32:18 +0000 (+0000) Subject: Add another check for broken browscap object X-Git-Tag: PRE_FILE_COMPILE_API_CHANGE~181 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7c296bd9cc0fcbd21ae370243a5425b554c271be;p=php Add another check for broken browscap object # I do not know how it could get broken, but just in case... --- diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c index 5b6de1176b..d578f61099 100644 --- a/ext/standard/browscap.c +++ b/ext/standard/browscap.c @@ -25,7 +25,7 @@ HashTable browser_hash; -#define DEFAULT_SECTION_NAME "Default Browser Capability Settings" +#define DEFAULT_SECTION_NAME "default browser capability settings" static int browser_reg_compare(zval **browser,int num_args, va_list args, zend_hash_key *key) { @@ -37,7 +37,10 @@ static int browser_reg_compare(zval **browser,int num_args, va_list args, zend_h if (*found_browser_entry) { /* already found */ return 0; } - zend_hash_find((*browser)->value.obj.properties, "browser_name_pattern",sizeof("browser_name_pattern"),(void **) &browser_name); + if(zend_hash_find((*browser)->value.obj.properties, "browser_name_pattern",sizeof("browser_name_pattern"),(void **) &browser_name) == FAILURE) { + return 0; + } + if (!strchr(browser_name->value.str.val,'*')) { return 0; }