Commitd962385

Michael Meskes

committed

Made ECPG more robust against applications freeing strings, based on

patch send in by Boszormenyi Zoltan <zb@cybertec.at>.

1 parent314288f commitd962385Copy full SHA for d962385

File tree

-2

lines changed

-2

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2438,6 +2438,11 @@ Thu, 01 Oct 2009 19:31:57 +0200`
`2438`	`2438`
`2439`	`2439`	`- Applied patch by Boszormenyi Zoltan <zb@cybertec.at> to fix memory`
`2440`	`2440`	`leak in decimal handling.`
	`2441`	`+`
	`2442`	`+Thu, 15 Oct 2009 12:15:31 +0200`
	`2443`	`+`
	`2444`	`+- Made ECPG more robust against applications freeing strings, based on`
	`2445`	`+ patch send in by Boszormenyi Zoltan <zb@cybertec.at>.`
`2441`	`2446`	`- Set ecpg library version to 6.2.`
`2442`	`2447`	`- Set compat library version to 3.2.`
`2443`	`2448`	`- Set ecpg version to 4.6.`

Lines changed: 4 additions & 2 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.32 2009/07/22 11:07:02 mha Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/prepare.c,v 1.33 2009/10/15 10:20:15 meskes Exp $ */`
`2`	`2`
`3`	`3`	`#definePOSTGRES_ECPG_INTERNAL`
`4`	`4`	`#include"postgres_fe.h"`
`@@ -152,14 +152,15 @@ ECPGprepare(int lineno, const char *connection_name, const bool questionmarks, c`
`152`	`152`	`replace_variables(&(stmt->command),lineno);`
`153`	`153`
`154`	`154`	`/* add prepared statement to our list */`
`155`		`-this->name=(char*)name;`
	`155`	`+this->name=ecpg_strdup(name,lineno);`
`156`	`156`	`this->stmt=stmt;`
`157`	`157`
`158`	`158`	`/* and finally really prepare the statement */`
`159`	`159`	`query=PQprepare(stmt->connection->connection,name,stmt->command,0,NULL);`
`160`	`160`	`if (!ecpg_check_PQresult(query,stmt->lineno,stmt->connection->connection,stmt->compat))`
`161`	`161`	`{`
`162`	`162`	`ecpg_free(stmt->command);`
	`163`	`+ecpg_free(this->name);`
`163`	`164`	`ecpg_free(this);`
`164`	`165`	`ecpg_free(stmt);`
`165`	`166`	`return false;`
`@@ -238,6 +239,7 @@ deallocate_one(int lineno, enum COMPAT_MODE c, struct connection * con, struct p`
`238`	`239`	`/* okay, free all the resources */`
`239`	`240`	`ecpg_free(this->stmt->command);`
`240`	`241`	`ecpg_free(this->stmt);`
	`242`	`+ecpg_free(this->name);`
`241`	`243`	`if (prev!=NULL)`
`242`	`244`	`prev->next=this->next;`
`243`	`245`	`else`

Comments

(0)