]> granicus.if.org Git - postgresql/commitdiff
Do not use already free'ed errmsg, bug found by Joachim Wieland
authorMichael Meskes <meskes@postgresql.org>
Mon, 19 Jun 2006 09:20:07 +0000 (09:20 +0000)
committerMichael Meskes <meskes@postgresql.org>
Mon, 19 Jun 2006 09:20:07 +0000 (09:20 +0000)
<joachim.wieland@credativ.de>

src/interfaces/ecpg/ecpglib/connect.c

index 69f81f2151c27b267570013a285cac50be345c45..0964fa8a8f9c0e8a4b03771eb6133e061ea3ccdc 100644 (file)
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.26.2.1 2005/11/30 12:50:37 meskes Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.26.2.2 2006/06/19 09:20:07 meskes Exp $ */
 
 #define POSTGRES_ECPG_INTERNAL
 #include "postgres_fe.h"
@@ -456,10 +456,6 @@ ECPGconnect(int lineno, int c, const char *name, const char *user, const char *p
                const char *errmsg = PQerrorMessage(this->connection);
                char       *db = realname ? realname : "<DEFAULT>";
 
-               ecpg_finish(this);
-#ifdef ENABLE_THREAD_SAFETY
-               pthread_mutex_unlock(&connections_mutex);
-#endif
                ECPGlog("connect: could not open database %s on %s port %s %s%s%s%s in line %d\n\t%s\n",
                                db,
                                host ? host : "<DEFAULT>",
@@ -468,6 +464,11 @@ ECPGconnect(int lineno, int c, const char *name, const char *user, const char *p
                                user ? "for user " : "", user ? user : "",
                                lineno, errmsg);
 
+               ecpg_finish(this);
+#ifdef ENABLE_THREAD_SAFETY
+               pthread_mutex_unlock(&connections_mutex);
+#endif
+
                ECPGraise(lineno, ECPG_CONNECT, ECPG_SQLSTATE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION, db);
                if (host)
                        ECPGfree(host);