diff options
| author | Stanislav Malyshev <stas@php.net> | 2000-07-23 11:32:18 +0000 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2000-07-23 11:32:18 +0000 |
| commit | 7c296bd9cc0fcbd21ae370243a5425b554c271be (patch) | |
| tree | 7cbe86f378bf06b49d4eb74a8405220959bc07ee | |
| parent | b410eaf6d48b683e8c70911de3a3c810cad0624c (diff) | |
| download | php-git-7c296bd9cc0fcbd21ae370243a5425b554c271be.tar.gz | |
Add another check for broken browscap object
# I do not know how it could get broken, but just in case...
| -rw-r--r-- | ext/standard/browscap.c | 7 |
1 files changed, 5 insertions, 2 deletions
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; } |