Commit1fe8d17

Michael Meskes

committed

Check for non-existant connection in prepare statement handling.

Do not close files that weren't opened.

1 parent000086b commit1fe8d17Copy full SHA for 1fe8d17

File tree

+17

-6

lines changed

+17

-6

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2346,6 +2346,11 @@ Thu, 10 Apr 2008 12:42:25 +0200`
`2346`	`2346`
`2347`	`2347`	`- Fixed bug in PGTYPEStimestamp_sub that used pointers instead of the`
`2348`	`2348`	`values to substract.`
	`2349`	`+`
	`2350`	`+Mon, 12 May 2008 18:19:08 +0200`
	`2351`	`+`
	`2352`	`+- Check for non-existant connection in prepare statement handling.`
	`2353`	`+- Do not close files that weren't opened.`
`2349`	`2354`	`- Set pgtypes library version to 3.1.`
`2350`	`2355`	`- Set compat library version to 3.1.`
`2351`	`2356`	`- Set ecpg library version to 6.2.`

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/prepare.c,v 1.26 2008/02/07 11:09:13 meskes Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/prepare.c,v 1.27 2008/05/12 16:29:04 meskes Exp $ */`
`2`	`2`
`3`	`3`	`#definePOSTGRES_ECPG_INTERNAL`
`4`	`4`	`#include"postgres_fe.h"`
`@@ -120,10 +120,11 @@ ECPGprepare(int lineno, const char *connection_name, const int questionmarks, co`
`120`	`120`	`structsqlca_t*sqlca=ECPGget_sqlca();`
`121`	`121`	`PGresult*query;`
`122`	`122`
`123`		`-ecpg_init_sqlca(sqlca);`
`124`		`-`
`125`	`123`	`con=ecpg_get_connection(connection_name);`
`126`	`124`
	`125`	`+if (!ecpg_init(con,connection_name,lineno))`
	`126`	`+return false;`
	`127`	`+`
`127`	`128`	`/* check if we already have prepared this statement */`
`128`	`129`	`this=find_prepared_statement(name,con,&prev);`
`129`	`130`	`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)`
`256`	`257`
`257`	`258`	`con=ecpg_get_connection(connection_name);`
`258`	`259`
	`260`	`+if (!ecpg_init(con,connection_name,lineno))`
	`261`	`+return false;`
	`262`	`+`
`259`	`263`	`this=find_prepared_statement(name,con,&prev);`
`260`	`264`	`if (this)`
`261`	`265`	`returndeallocate_one(lineno,c,con,prev,this);`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.363 2008/03/27 07:56:00 meskes Exp $*/`
	`1`	`+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.364 2008/05/12 16:29:04 meskes Exp $*/`
`2`	`2`
`3`	`3`	`/* Copyright comment*/`
`4`	`4`	`%{`
`@@ -87,8 +87,10 @@ mmerror(int error_code, enum errortype type, char * error, ...)`
`87`	`87`	`ret_value = error_code;`
`88`	`88`	`break;`
`89`	`89`	`case ET_FATAL:`
`90`		`-fclose(yyin);`
`91`		`-fclose(yyout);`
	`90`	`+if (yyin)`
	`91`	`+fclose(yyin);`
	`92`	`+if (yyout)`
	`93`	`+fclose(yyout);`
`92`	`94`	`if (unlink(output_filename) !=0 && *output_filename !='-')`
`93`	`95`	`fprintf(stderr,"Could not remove output file %s!\n", output_filename);`
`94`	`96`	`exit(error_code);`

Comments

(0)