NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitfe0e0b4

committed

Fix memory leak in pgbench

Commit25ee705 introduced a memory leak in pgbench: some PGresultstructs were not being freed during error bailout, because we're nowdoing more PQgetResult() calls than previously. Since there's morecleanup code outside the discard_response() routine than in it, refactorthe cleanup code, removing the routine.This has little effect currently, since we abandon processing afterhitting errors, but if we ever get further pgbench features (such astesting for serializable transactions), it'll matter.Per Coverity.Reviewed-by: Michaël Paquier

1 parenta2418f9 commitfe0e0b4Copy full SHA for fe0e0b4

File tree

1 file changed

+18

-30

lines changed

src/bin/pgbench
- pgbench.c

1 file changed

+18

-30

lines changed

`‎src/bin/pgbench/pgbench.c`

Lines changed: 18 additions & 30 deletions

Original file line number	Diff line number	Diff line change
`@@ -1214,20 +1214,6 @@ doConnect(void)`
`1214`	`1214`	`returnconn;`
`1215`	`1215`	`}`
`1216`	`1216`
`1217`		`-/* throw away response from backend */`
`1218`		`-staticvoid`
`1219`		`-discard_response(CState*state)`
`1220`		`-{`
`1221`		`-PGresult*res;`
`1222`		`-`
`1223`		`-do`
`1224`		`-{`
`1225`		`-res=PQgetResult(state->con);`
`1226`		`-if (res)`
`1227`		`-PQclear(res);`
`1228`		`-}while (res);`
`1229`		`-}`
`1230`		`-`
`1231`	`1217`	`/* qsort comparator for Variable array */`
`1232`	`1218`	`staticint`
`1233`	`1219`	`compareVariableNames(constvoidv1,constvoidv2)`
`@@ -2732,14 +2718,15 @@ static bool`
`2732`	`2718`	`readCommandResponse(CStatest,charvarprefix)`
`2733`	`2719`	`{`
`2734`	`2720`	`PGresult*res;`
	`2721`	`+PGresult*next_res;`
`2735`	`2722`	`intqrynum=0;`
`2736`	`2723`
`2737`	`2724`	`res=PQgetResult(st->con);`
`2738`	`2725`
`2739`	`2726`	`while (res!=NULL)`
`2740`	`2727`	`{`
`2741`	`2728`	`/* look now at the next result to know whether it is the last */`
`2742`		`-PGresult*next_res=PQgetResult(st->con);`
	`2729`	`+next_res=PQgetResult(st->con);`
`2743`	`2730`	`boolis_last= (next_res==NULL);`
`2744`	`2731`
`2745`	`2732`	`switch (PQresultStatus(res))`
`@@ -2751,8 +2738,7 @@ readCommandResponse(CState st, char varprefix)`
`2751`	`2738`	`fprintf(stderr,`
`2752`	`2739`	`"client %d script %d command %d query %d: expected one row, got %d\n",`
`2753`	`2740`	`st->id,st->use_file,st->command,qrynum,0);`
`2754`		`-st->ecnt++;`
`2755`		`-return false;`
	`2741`	`+gotoerror;`
`2756`	`2742`	`}`
`2757`	`2743`	`break;`
`2758`	`2744`
`@@ -2764,10 +2750,7 @@ readCommandResponse(CState st, char varprefix)`
`2764`	`2750`	`fprintf(stderr,`
`2765`	`2751`	`"client %d script %d command %d query %d: expected one row, got %d\n",`
`2766`	`2752`	`st->id,st->use_file,st->command,qrynum,PQntuples(res));`
`2767`		`-st->ecnt++;`
`2768`		`-PQclear(res);`
`2769`		`-discard_response(st);`
`2770`		`-return false;`
	`2753`	`+gotoerror;`
`2771`	`2754`	`}`
`2772`	`2755`
`2773`	`2756`	`/* store results into variables */`
`@@ -2788,10 +2771,7 @@ readCommandResponse(CState st, char varprefix)`
`2788`	`2771`	`"client %d script %d command %d query %d: error storing into variable %s\n",`
`2789`	`2772`	`st->id,st->use_file,st->command,qrynum,`
`2790`	`2773`	`varname);`
`2791`		`-st->ecnt++;`
`2792`		`-PQclear(res);`
`2793`		`-discard_response(st);`
`2794`		`-return false;`
	`2774`	`+gotoerror;`
`2795`	`2775`	`}`
`2796`	`2776`
`2797`	`2777`	`if (*varprefix!='\0')`
`@@ -2807,10 +2787,7 @@ readCommandResponse(CState st, char varprefix)`
`2807`	`2787`	`"client %d script %d aborted in command %d query %d: %s",`
`2808`	`2788`	`st->id,st->use_file,st->command,qrynum,`
`2809`	`2789`	`PQerrorMessage(st->con));`
`2810`		`-st->ecnt++;`
`2811`		`-PQclear(res);`
`2812`		`-discard_response(st);`
`2813`		`-return false;`
	`2790`	`+gotoerror;`
`2814`	`2791`	`}`
`2815`	`2792`
`2816`	`2793`	`PQclear(res);`
`@@ -2826,8 +2803,19 @@ readCommandResponse(CState st, char varprefix)`
`2826`	`2803`	`}`
`2827`	`2804`
`2828`	`2805`	`return true;`
`2829`		`-}`
`2830`	`2806`
	`2807`	`+error:`
	`2808`	`+st->ecnt++;`
	`2809`	`+PQclear(res);`
	`2810`	`+PQclear(next_res);`
	`2811`	`+do`
	`2812`	`+{`
	`2813`	`+res=PQgetResult(st->con);`
	`2814`	`+PQclear(res);`
	`2815`	`+}while (res);`
	`2816`	`+`
	`2817`	`+return false;`
	`2818`	`+}`
`2831`	`2819`
`2832`	`2820`	`/*`
`2833`	`2821`	`* Parse the argument to a \sleep command, and return the requested amount`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitfe0e0b4

File tree

1 file changed

1 file changed

`‎src/bin/pgbench/pgbench.c`

0 commit comments