clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix a crash I run into on occasion

Browse Source
This commit is contained in:
Shane Caraveo 2003-06-30 20:31:57 +00:00
parent a62928a3e8
commit d6ee8bab7f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ext/standard/browscap.c
View File

@ -145,7 +145,7 @@ PHP_MINIT_FUNCTION(browscap)
{
char *browscap = INI_STR("browscap");
if (browscap) {
if (browscap && browscap[0]) {
zend_file_handle fh;
memset(&fh, 0, sizeof(fh));
@ -173,7 +173,8 @@ PHP_MINIT_FUNCTION(browscap)
*/
PHP_MSHUTDOWN_FUNCTION(browscap)
{
if (INI_STR("browscap")) {
char *browscap = INI_STR("browscap");
if (browscap && browscap[0]) {
zend_hash_destroy(&browser_hash);
}
return SUCCESS;
@ -224,8 +225,9 @@ PHP_FUNCTION(get_browser)
zval *found_browser_entry, *tmp_copy;
char *lookup_browser_name;
zend_bool return_array = 0;
char *browscap = INI_STR("browscap");
if (!INI_STR("browscap")) {
if (!browscap || !browscap[0]) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "browscap ini directive not set.");
RETURN_FALSE;
}