From: Scott MacVicar <scottmac@php.net>
Date: Fri, 3 Jun 2011 00:42:07 +0000 (+0000)
Subject: Fix Bug #54918 - Crash when there is a failure to read the browscap file
X-Git-Tag: php-5.4.0alpha1~101
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0c107d3bf3b912431ea18cafa9a3d6a01a1e2e6f;p=php

Fix Bug #54918 - Crash when there is a failure to read the browscap file
---

diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c
index 282d9619ae..a2bcb131cd 100644
--- a/ext/standard/browscap.c
+++ b/ext/standard/browscap.c
@@ -333,19 +333,19 @@ PHP_INI_MH(OnChangeBrowscap)
 PHP_MINIT_FUNCTION(browscap) /* {{{ */
 {
 	char *browscap = INI_STR("browscap");
-	
-	if (browscap && browscap[0]) {
-		if (browscap_read_file(browscap, &global_bdata, 1 TSRMLS_CC) == FAILURE) {
-			return FAILURE;
-		}
-	}
-	
+
 #ifdef ZTS
 	ts_allocate_id(&browscap_globals_id, sizeof(browser_data),
 		browscap_globals_ctor, NULL);
 #endif
 	/* ctor call not really needed for non-ZTS */
 
+	if (browscap && browscap[0]) {
+		if (browscap_read_file(browscap, &global_bdata, 1 TSRMLS_CC) == FAILURE) {
+			return FAILURE;
+		}
+	}
+
 	return SUCCESS;
 }
 /* }}} */