svn: /php/php-src/ branches/PHP_5_4/ext/standard/browscap.c trunk/ext/standard/browscap.c

scottmac Fri, 03 Jun 2011 00:42:07 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=311745 Log: Fix Bug #54918 - Crash when there is a failure to read the browscap file Bug: http://bugs.php.net/54918 (Assigned) browscap issues Changed paths: U php/php-src/branches/PHP_5_4/ext/standard/browscap.c U php/php-src/trunk/ext/standard/browscap.c Modified: php/php-src/branches/PHP_5_4/ext/standard/browscap.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/standard/browscap.c 2011-06-03 00:35:22 UTC (rev 311744) +++ php/php-src/branches/PHP_5_4/ext/standard/browscap.c 2011-06-03 00:42:07 UTC (rev 311745) @@ -333,19 +333,19 @@ 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; } /* }}} */ Modified: php/php-src/trunk/ext/standard/browscap.c =================================================================== --- php/php-src/trunk/ext/standard/browscap.c 2011-06-03 00:35:22 UTC (rev 311744) +++ php/php-src/trunk/ext/standard/browscap.c 2011-06-03 00:42:07 UTC (rev 311745) @@ -333,19 +333,19 @@ 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; } /* }}} */