libpq: Fix minor memory leaks

petere · petere · commit d4318483e151 · 2012-03-16T20:35:00.000+02:00
When using connection info arrays with a conninfo string in the dbname
slot, some memory would be leaked if an error occurred while
processing the following array slots.

found by Coverity
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -4303,6 +4303,7 @@ conninfo_array_parse(const char *const * keywords, const char *const * values,
 	{
 		printfPQExpBuffer(errorMessage,
 						  libpq_gettext("out of memory\n"));
+		PQconninfoFree(str_options);
 		return NULL;
 	}
 	memcpy(options, PQconninfoOptions, sizeof(PQconninfoOptions));
@@ -4330,6 +4331,7 @@ conninfo_array_parse(const char *const * keywords, const char *const * values,
 						 libpq_gettext("invalid connection option \"%s\"\n"),
 								  pname);
 				PQconninfoFree(options);
+				PQconninfoFree(str_options);
 				return NULL;
 			}
 
@@ -4374,6 +4376,7 @@ conninfo_array_parse(const char *const * keywords, const char *const * values,
 					printfPQExpBuffer(errorMessage,
 									  libpq_gettext("out of memory\n"));
 					PQconninfoFree(options);
+					PQconninfoFree(str_options);
 					return NULL;
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -4303,6 +4303,7 @@ conninfo_array_parse(const char const keywords, const char const values,`
`4303`	`4303`	`{`
`4304`	`4304`	`printfPQExpBuffer(errorMessage,`
`4305`	`4305`	`libpq_gettext("out of memory\n"));`
	`4306`	`+ PQconninfoFree(str_options);`
`4306`	`4307`	`return NULL;`
`4307`	`4308`	`}`
`4308`	`4309`	`memcpy(options, PQconninfoOptions, sizeof(PQconninfoOptions));`
`@@ -4330,6 +4331,7 @@ conninfo_array_parse(const char const keywords, const char const values,`
`4330`	`4331`	`libpq_gettext("invalid connection option \"%s\"\n"),`
`4331`	`4332`	`pname);`
`4332`	`4333`	`PQconninfoFree(options);`
	`4334`	`+ PQconninfoFree(str_options);`
`4333`	`4335`	`return NULL;`
`4334`	`4336`	`}`
`4335`	`4337`
`@@ -4374,6 +4376,7 @@ conninfo_array_parse(const char const keywords, const char const values,`
`4374`	`4376`	`printfPQExpBuffer(errorMessage,`
`4375`	`4377`	`libpq_gettext("out of memory\n"));`
`4376`	`4378`	`PQconninfoFree(options);`
	`4379`	`+ PQconninfoFree(str_options);`
`4377`	`4380`	`return NULL;`
`4378`	`4381`	`}`
`4379`	`4382`	`}`