From: Shane Caraveo <shane@php.net>
Date: Mon, 30 Jun 2003 20:31:57 +0000 (+0000)
Subject: fix a crash I run into on occasion
X-Git-Tag: BEFORE_ARG_INFO~510
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d6ee8bab7f8460ad92030ca6ed38bbe5d7cbbba7;p=php

fix a crash I run into on occasion
---

diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c
index 7555d27938..480690c5e7 100644
--- a/ext/standard/browscap.c
+++ b/ext/standard/browscap.c
@@ -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;
 	}