From db58e8ff7cec9a14418d6dccd33bbe186d10c1f4 Mon Sep 17 00:00:00 2001 From: Michael Meskes Date: Tue, 26 Nov 2013 17:14:07 +0100 Subject: [PATCH] ECPG: Free the malloc()'ed variables in the test so it comes out clean on Valgrind runs. Patch by Boszormenyi Zoltan --- .../ecpg/test/expected/preproc-outofscope.c | 15 +++++++++------ .../ecpg/test/expected/preproc-outofscope.stderr | 8 ++++---- src/interfaces/ecpg/test/preproc/outofscope.pgc | 3 +++ 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/interfaces/ecpg/test/expected/preproc-outofscope.c b/src/interfaces/ecpg/test/expected/preproc-outofscope.c index 125d7d8513..2438911a9e 100644 --- a/src/interfaces/ecpg/test/expected/preproc-outofscope.c +++ b/src/interfaces/ecpg/test/expected/preproc-outofscope.c @@ -347,28 +347,31 @@ if (sqlca.sqlcode < 0) exit (1);} close_cur1(); + free(myvar); + free(mynullvar); + strcpy(msg, "drop"); { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table a1", ECPGt_EOIT, ECPGt_EORT); -#line 115 "outofscope.pgc" +#line 118 "outofscope.pgc" if (sqlca.sqlcode < 0) exit (1);} -#line 115 "outofscope.pgc" +#line 118 "outofscope.pgc" strcpy(msg, "commit"); { ECPGtrans(__LINE__, NULL, "commit"); -#line 118 "outofscope.pgc" +#line 121 "outofscope.pgc" if (sqlca.sqlcode < 0) exit (1);} -#line 118 "outofscope.pgc" +#line 121 "outofscope.pgc" strcpy(msg, "disconnect"); { ECPGdisconnect(__LINE__, "CURRENT"); -#line 121 "outofscope.pgc" +#line 124 "outofscope.pgc" if (sqlca.sqlcode < 0) exit (1);} -#line 121 "outofscope.pgc" +#line 124 "outofscope.pgc" return (0); diff --git a/src/interfaces/ecpg/test/expected/preproc-outofscope.stderr b/src/interfaces/ecpg/test/expected/preproc-outofscope.stderr index 91d350554e..c7f8771c69 100644 --- a/src/interfaces/ecpg/test/expected/preproc-outofscope.stderr +++ b/src/interfaces/ecpg/test/expected/preproc-outofscope.stderr @@ -102,13 +102,13 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 58: OK: CLOSE CURSOR [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 115: query: drop table a1; with 0 parameter(s) on connection regress1 +[NO_PID]: ecpg_execute on line 118: query: drop table a1; with 0 parameter(s) on connection regress1 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 115: using PQexec +[NO_PID]: ecpg_execute on line 118: using PQexec [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 115: OK: DROP TABLE +[NO_PID]: ecpg_execute on line 118: OK: DROP TABLE [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGtrans on line 118: action "commit"; connection "regress1" +[NO_PID]: ECPGtrans on line 121: action "commit"; connection "regress1" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_finish: connection regress1 closed [NO_PID]: sqlca: code: 0, state: 00000 diff --git a/src/interfaces/ecpg/test/preproc/outofscope.pgc b/src/interfaces/ecpg/test/preproc/outofscope.pgc index 25efe75cca..6b5d2707ce 100644 --- a/src/interfaces/ecpg/test/preproc/outofscope.pgc +++ b/src/interfaces/ecpg/test/preproc/outofscope.pgc @@ -111,6 +111,9 @@ main (void) close_cur1(); + free(myvar); + free(mynullvar); + strcpy(msg, "drop"); exec sql drop table a1;