From 67ce49d3ab8f692644b5a08bb2b12853e778878d Mon Sep 17 00:00:00 2001 From: Mukund Sivaraman Date: Mon, 28 Jul 2014 08:41:59 +0530 Subject: [PATCH] 3900. [bug] Fix a crash in PostgreSQL DLZ driver. [RT #36637] Squashed commit of the following: commit ebdade4dfe59fc11d3c4ad8111729f722aab2008 Author: Mukund Sivaraman Date: Thu Jul 24 22:52:54 2014 +0530 Move statement to be after comment commit 4b5d6a33350a469afb8e273bc552055824a32570 Author: Mukund Sivaraman Date: Thu Jul 24 21:42:52 2014 +0530 Return NULL in *rs so that caller doesn't PQclear() it again (cherry picked from commit 586db4a3e4664109fe8ce31fdd6a1b9c5bb67cbf) --- CHANGES | 2 ++ contrib/dlz/drivers/dlz_postgres_driver.c | 1 + 2 files changed, 3 insertions(+) diff --git a/CHANGES b/CHANGES index 7b04c15e2b..0b9cb91e47 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ +3900. [bug] Fix a crash in PostgreSQL DLZ driver. [RT #36637] + 3899. [bug] "request-ixfr" is only applicable to slave and redirect zones. [RT #36608] diff --git a/contrib/dlz/drivers/dlz_postgres_driver.c b/contrib/dlz/drivers/dlz_postgres_driver.c index 8254e0487d..85ba5761e3 100644 --- a/contrib/dlz/drivers/dlz_postgres_driver.c +++ b/contrib/dlz/drivers/dlz_postgres_driver.c @@ -577,6 +577,7 @@ postgres_get_resultset(const char *zone, const char *record, #endif PQclear(*rs); /* get rid of it */ /* in case this was the last attempt */ + *rs = NULL; result = ISC_R_FAILURE; } }