Commit a8261182 authored by Michael Meskes's avatar Michael Meskes

fixed bug in connect.c

parent f09546fa
...@@ -411,17 +411,6 @@ ECPGconnect(int lineno, const char *name, const char *user, const char *passwd, ...@@ -411,17 +411,6 @@ ECPGconnect(int lineno, const char *name, const char *user, const char *passwd,
this->connection = PQsetdbLogin(host, port, options, NULL, realname, user, passwd); this->connection = PQsetdbLogin(host, port, options, NULL, realname, user, passwd);
if (host)
free(host);
if (port)
free(port);
if (options)
free(options);
if (realname)
free(realname);
if (dbname)
free(dbname);
if (PQstatus(this->connection) == CONNECTION_BAD) if (PQstatus(this->connection) == CONNECTION_BAD)
{ {
ecpg_finish(this); ecpg_finish(this);
...@@ -433,9 +422,30 @@ ECPGconnect(int lineno, const char *name, const char *user, const char *passwd, ...@@ -433,9 +422,30 @@ ECPGconnect(int lineno, const char *name, const char *user, const char *passwd,
user ? "for user " : "", user ? user : "", user ? "for user " : "", user ? user : "",
lineno); lineno);
ECPGraise(lineno, ECPG_CONNECT, realname ? realname : "<DEFAULT>"); ECPGraise(lineno, ECPG_CONNECT, realname ? realname : "<DEFAULT>");
if (host)
free(host);
if (port)
free(port);
if (options)
free(options);
if (realname)
free(realname);
if (dbname)
free(dbname);
return false; return false;
} }
if (host)
free(host);
if (port)
free(port);
if (options)
free(options);
if (realname)
free(realname);
if (dbname)
free(dbname);
this->committed = true; this->committed = true;
this->autocommit = autocommit; this->autocommit = autocommit;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment