]> granicus.if.org Git - php/commitdiff
fix a crash I run into on occasion
authorShane Caraveo <shane@php.net>
Mon, 30 Jun 2003 20:31:57 +0000 (20:31 +0000)
committerShane Caraveo <shane@php.net>
Mon, 30 Jun 2003 20:31:57 +0000 (20:31 +0000)
ext/standard/browscap.c

index 7555d27938e6f6a252de13dd9a158d2cbcf7b99c..480690c5e75bd12fc188a80b1efa87b2ff1f0066 100644 (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;
        }