diff options
| author | Scott MacVicar <scottmac@php.net> | 2011-06-03 00:42:07 +0000 |
|---|---|---|
| committer | Scott MacVicar <scottmac@php.net> | 2011-06-03 00:42:07 +0000 |
| commit | 0c107d3bf3b912431ea18cafa9a3d6a01a1e2e6f (patch) | |
| tree | a3564386a90c9db2f8cbd5af39e4be4699ccce5c | |
| parent | 76cbcc7f663f18fe4cc6ae3de06261f67c9b3ff2 (diff) | |
| download | php-git-0c107d3bf3b912431ea18cafa9a3d6a01a1e2e6f.tar.gz | |
Fix Bug #54918 - Crash when there is a failure to read the browscap file
| -rw-r--r-- | ext/standard/browscap.c | 14 |
1 files changed, 7 insertions, 7 deletions
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; } /* }}} */ |