From b1bc2f60e371ad3f485a1a311cade6b9ee0efc5f Mon Sep 17 00:00:00 2001 From: Michael Meskes Date: Mon, 12 May 2008 16:29:04 +0000 Subject: [PATCH] Check for non-existant connection in prepare statement handling. Do not close files that weren't opened. --- src/interfaces/ecpg/ChangeLog | 5 +++++ src/interfaces/ecpg/ecpglib/prepare.c | 8 ++++++-- src/interfaces/ecpg/preproc/preproc.y | 6 ++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog index a5eb10b351..0572925d08 100644 --- a/src/interfaces/ecpg/ChangeLog +++ b/src/interfaces/ecpg/ChangeLog @@ -2346,6 +2346,11 @@ Thu, 10 Apr 2008 12:42:25 +0200 - Fixed bug in PGTYPEStimestamp_sub that used pointers instead of the values to substract. + +Mon, 12 May 2008 18:19:08 +0200 + + - Check for non-existant connection in prepare statement handling. + - Do not close files that weren't opened. - Set pgtypes library version to 3.1. - Set compat library version to 3.1. - Set ecpg library version to 6.2. diff --git a/src/interfaces/ecpg/ecpglib/prepare.c b/src/interfaces/ecpg/ecpglib/prepare.c index e1cc60ee19..f20c7e7bad 100644 --- a/src/interfaces/ecpg/ecpglib/prepare.c +++ b/src/interfaces/ecpg/ecpglib/prepare.c @@ -120,10 +120,11 @@ ECPGprepare(int lineno, const char *connection_name, const int questionmarks, co struct sqlca_t *sqlca = ECPGget_sqlca(); PGresult *query; - ecpg_init_sqlca(sqlca); - con = ecpg_get_connection(connection_name); + if (!ecpg_init(con, connection_name, lineno)) + return false; + /* check if we already have prepared this statement */ this = find_prepared_statement(name, con, &prev); if (this && !deallocate_one(lineno, ECPG_COMPAT_PGSQL, con, prev, this)) @@ -256,6 +257,9 @@ ECPGdeallocate(int lineno, int c, const char *connection_name, const char *name) con = ecpg_get_connection(connection_name); + if (!ecpg_init(con, connection_name, lineno)) + return false; + this = find_prepared_statement(name, con, &prev); if (this) return deallocate_one(lineno, c, con, prev, this); diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y index a43974f42a..56ff85c013 100644 --- a/src/interfaces/ecpg/preproc/preproc.y +++ b/src/interfaces/ecpg/preproc/preproc.y @@ -87,8 +87,10 @@ mmerror(int error_code, enum errortype type, char * error, ...) ret_value = error_code; break; case ET_FATAL: - fclose(yyin); - fclose(yyout); + if (yyin) + fclose(yyin); + if (yyout) + fclose(yyout); if (unlink(output_filename) != 0 && *output_filename != '-') fprintf(stderr, "Could not remove output file %s!\n", output_filename); exit(error_code); -- 2.39.5