Fix memory leak when an empty ident file is reloaded.

hlinnaka · hlinnaka · commit b0aa17706e21 · 2013-10-24T14:05:34.000+03:00
Hari Babu
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
@@ -2235,16 +2235,18 @@ load_ident(void)
 	}
 
 	/* Loaded new file successfully, replace the one we use */
-	if (parsed_ident_lines != NULL)
+	if (parsed_ident_lines != NIL)
 	{
 		foreach(parsed_line_cell, parsed_ident_lines)
 		{
 			newline = (IdentLine *) lfirst(parsed_line_cell);
 			if (newline->ident_user[0] == '/')
 				pg_regfree(&newline->re);
 		}
-		MemoryContextDelete(parsed_ident_context);
 	}
+	if (parsed_ident_context != NULL)
+		MemoryContextDelete(parsed_ident_context);
+
 	parsed_ident_context = ident_context;
 	parsed_ident_lines = new_parsed_lines;
 

Original file line number	Diff line number	Diff line change
`@@ -2235,16 +2235,18 @@ load_ident(void)`
`2235`	`2235`	`}`
`2236`	`2236`
`2237`	`2237`	`/* Loaded new file successfully, replace the one we use */`
`2238`		`- if (parsed_ident_lines != NULL)`
	`2238`	`+ if (parsed_ident_lines != NIL)`
`2239`	`2239`	`{`
`2240`	`2240`	`foreach(parsed_line_cell, parsed_ident_lines)`
`2241`	`2241`	`{`
`2242`	`2242`	`newline = (IdentLine *) lfirst(parsed_line_cell);`
`2243`	`2243`	`if (newline->ident_user[0] == '/')`
`2244`	`2244`	`pg_regfree(&newline->re);`
`2245`	`2245`	`}`
`2246`		`- MemoryContextDelete(parsed_ident_context);`
`2247`	`2246`	`}`
	`2247`	`+ if (parsed_ident_context != NULL)`
	`2248`	`+ MemoryContextDelete(parsed_ident_context);`
	`2249`	`+`
`2248`	`2250`	`parsed_ident_context = ident_context;`
`2249`	`2251`	`parsed_ident_lines = new_parsed_lines;`
`2250`	`2252`