Fixed crash in _php_ibase_error() after request shutdown (also fixes #7014)

diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c
index f5768c170c1d5a59bf865fe7139ae81842e796cf..f37325cf543ae9274b3adcbcabb337a8fd83f8c7 100644 (file)
--- a/ext/interbase/interbase.c
+++ b/ext/interbase/interbase.c
@@ -531,7 +531,6 @@ static void php_ibase_init_globals(zend_ibase_globals *ibase_globals)
        ibase_globals->timestampformat = NULL;
        ibase_globals->dateformat = NULL;
        ibase_globals->timeformat = NULL;
-       ibase_globals->errmsg = NULL;
        ibase_globals->num_persistent = 0;
 }
 
@@ -588,10 +587,7 @@ PHP_RINIT_FUNCTION(ibase)
        }
        IBG(timeformat) = DL_STRDUP(IBG(cfg_timeformat));
 
-       if (IBG(errmsg)) {
-               DL_FREE(IBG(errmsg));
-       }
-       IBG(errmsg) = DL_MALLOC(sizeof(char)*MAX_ERRMSG+1);
+       RESET_ERRMSG;
 
        return SUCCESS;
 }
@@ -619,11 +615,6 @@ PHP_RSHUTDOWN_FUNCTION(ibase)
        }
        IBG(timeformat) = NULL;
 
-       if (IBG(errmsg)) {
-               DL_FREE(IBG(errmsg));
-       }
-       IBG(errmsg) = NULL;
-
        return SUCCESS;
 } 
  

diff --git a/ext/interbase/php_interbase.h b/ext/interbase/php_interbase.h
index c7a49ae779e31d9a455626e11c4e10d44bb736c5..f2b62dda6eb24f636d79960ee2840ab959c0300d 100644 (file)
--- a/ext/interbase/php_interbase.h
+++ b/ext/interbase/php_interbase.h
@@ -102,7 +102,7 @@ ZEND_BEGIN_MODULE_GLOBALS(ibase)
        char *cfg_dateformat;
        char *timeformat;
        char *cfg_timeformat;
-       char *errmsg;
+       char errmsg[MAX_ERRMSG];
 ZEND_END_MODULE_GLOBALS(ibase)
 
 typedef struct {