From e084903eabab8336207396ee110ed1eaff76b3e1 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Wed, 13 Aug 2003 13:27:36 +0000 Subject: [PATCH] Fixed crash in _php_ibase_error() after request shutdown (also fixes #7014) --- ext/interbase/interbase.c | 11 +---------- ext/interbase/php_interbase.h | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c index f5768c170c..f37325cf54 100644 --- 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 c7a49ae779..f2b62dda6e 100644 --- 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 { -- 2.50.1