Commitaaf125f

Michael Meskes

committed

Do not use already free'ed errmsg, bug found by Joachim Wieland

<joachim.wieland@credativ.de>

1 parentb13c968 commitaaf125fCopy full SHA for aaf125f

File tree

+19

-9

lines changed

+19

-9

lines changed

Lines changed: 13 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1996,15 +1996,24 @@ Tu Feb 7 18:48:14 CET 2006`
`1996`	`1996`
`1997`	`1997`	`Fri, 17 Mar 2006 16:38:19 +0100`
`1998`	`1998`
`1999`		`-- Fixed bug 2330: Wrong error code in case of a duplicate key`
	`1999`	`+- Fixed bug 2330: Wrong error code in case of a duplicate key.`
`2000`	`2000`
`2001`	`2001`	`Mo Apr 24 11:40:05 CEST 2006`
`2002`	`2002`
`2003`	`2003`	`- Fixed memory leak bugs found by Martijn Oosterhout.`
`2004`	`2004`
`2005`		`-Mi Mai 31 10:10:36 CEST 2006`
	`2005`	`+We Mai 31 10:10:36 CEST 2006`
`2006`	`2006`
`2007`		`-- Fixed PGTYPESdate_from_timestamp because some characters got lost there`
	`2007`	`+- Fixed PGTYPESdate_from_timestamp because some characters got lost there.`
	`2008`	`+`
	`2009`	`+Tu Jun 6 12:09:56 CEST 2006`
	`2010`	`+`
	`2011`	`+- Fixed two more memory leaks in ecpglib.`
	`2012`	`+- Synced parser.`
	`2013`	`+`
	`2014`	`+Mo Jun 19 11:15:50 CEST 2006`
	`2015`	`+`
	`2016`	`+- Do not use already free'ed errmsg, bug found by Joachim Wieland`
	`2017`	`+ <joachim.wieland@credativ.de>`
`2008`	`2018`	`- Set ecpg library version to 5.2.`
`2009`	`2019`	`- Set ecpg version to 4.2.1.`
`2010`		`-`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.27 2005/11/30 12:49:49 meskes Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.28 2006/06/19 09:19:49 meskes Exp $ */`
`2`	`2`
`3`	`3`	`#definePOSTGRES_ECPG_INTERNAL`
`4`	`4`	`#include"postgres_fe.h"`
`@@ -456,10 +456,6 @@ ECPGconnect(int lineno, int c, const char name, const char user, const char *p`
`456`	`456`	`constchar*errmsg=PQerrorMessage(this->connection);`
`457`	`457`	`char*db=realname ?realname :"<DEFAULT>";`
`458`	`458`
`459`		`-ecpg_finish(this);`
`460`		`-#ifdefENABLE_THREAD_SAFETY`
`461`		`-pthread_mutex_unlock(&connections_mutex);`
`462`		`-#endif`
`463`	`459`	`ECPGlog("connect: could not open database %s on %s port %s %s%s%s%s in line %d\n\t%s\n",`
`464`	`460`	`db,`
`465`	`461`	`host ?host :"<DEFAULT>",`
`@@ -468,6 +464,11 @@ ECPGconnect(int lineno, int c, const char name, const char user, const char *p`
`468`	`464`	`user ?"for user " :"",user ?user :"",`
`469`	`465`	`lineno,errmsg);`
`470`	`466`
	`467`	`+ecpg_finish(this);`
	`468`	`+#ifdefENABLE_THREAD_SAFETY`
	`469`	`+pthread_mutex_unlock(&connections_mutex);`
	`470`	`+#endif`
	`471`	`+`
`471`	`472`	`ECPGraise(lineno,ECPG_CONNECT,ECPG_SQLSTATE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION,db);`
`472`	`473`	`if (host)`
`473`	`474`	`ECPGfree(host);`

Comments

(0)