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 282d9619aec9f05fe2377a4180419a044d04441f..a2bcb131cd5e43cc0e99de2711a6943810d213ac 100644 (file)
--- 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;
 }
 /* }}} */