diff options
| author | Tom Lane | 1998-10-14 15:17:51 +0000 |
|---|---|---|
| committer | Tom Lane | 1998-10-14 15:17:51 +0000 |
| commit | acc9c38471cc2bd3a3c56e8dcd2ecd568dce9392 (patch) | |
| tree | 515121c727b047e349eac3dcd10bb1d5145c8b46 | |
| parent | aa3a1f46dfab92aa3205f0c6cbf2697d9ac95adc (diff) | |
Fix another memory leak in pg_select --- pointed out by [email protected]
| -rw-r--r-- | src/interfaces/libpgtcl/pgtclCmds.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/interfaces/libpgtcl/pgtclCmds.c b/src/interfaces/libpgtcl/pgtclCmds.c index 563bd176848..258c780e590 100644 --- a/src/interfaces/libpgtcl/pgtclCmds.c +++ b/src/interfaces/libpgtcl/pgtclCmds.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.37 1998/10/02 01:37:17 tgl Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.38 1998/10/14 15:17:51 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1230,7 +1230,8 @@ Pg_select(ClientData cData, Tcl_Interp * interp, int argc, char **argv) Pg_ConnectionId *connid; PGconn *conn; PGresult *result; - int r; + int r, + retval; size_t tupno, column, ncols; @@ -1293,6 +1294,8 @@ Pg_select(ClientData cData, Tcl_Interp * interp, int argc, char **argv) sprintf(buffer, "%d", ncols); Tcl_SetVar2(interp, argv[3], ".numcols", buffer, 0); + retval = TCL_OK; + for (tupno = 0; tupno < PQntuples(result); tupno++) { sprintf(buffer, "%d", tupno); @@ -1306,10 +1309,7 @@ Pg_select(ClientData cData, Tcl_Interp * interp, int argc, char **argv) if ((r = Tcl_Eval(interp, argv[4])) != TCL_OK && r != TCL_CONTINUE) { if (r == TCL_BREAK) - { - PQclear(result); - return TCL_OK; - } + break; /* exit loop, but return TCL_OK */ if (r == TCL_ERROR) { @@ -1320,15 +1320,15 @@ Pg_select(ClientData cData, Tcl_Interp * interp, int argc, char **argv) Tcl_AddErrorInfo(interp, msg); } - PQclear(result); - return r; + retval = r; + break; } } ckfree((void *) info); Tcl_UnsetVar(interp, argv[3], 0); PQclear(result); - return TCL_OK; + return retval; } /* |