postgres.git / summary / log / commit / refs

commit    b0aa17706e210dec4e8d744eac1682e0c6a0a3b0
Author:   Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date:     Thu Oct 24 11:03:26 2013 +0000
First released in: 9.4.0, 9.3.2

    Fix memory leak when an empty ident file is reloaded.
    
    Hari Babu


 src/backend/libpq/hba.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index 91f6ced0d2f..1c75acc94b6 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -2235,7 +2235,7 @@ 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)
 		{
@@ -2243,8 +2243,10 @@ load_ident(void)
 			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;
 


[parent: 80eba5981e0f]