diff --git a/CHANGES b/CHANGES
index abdd3b8dfd..b304956e03 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1635.	[bug]		Memory leak on error in query_addds().
+
 1633.	[bug]		named should return NOTIMP to update requests to a
 			slaves without a allow-update-forwarding acl specified.
 			[RT #11331]
diff --git a/bin/named/query.c b/bin/named/query.c
index b86e431893..39170b3bea 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.198.2.13.4.27 2004/04/15 02:10:38 marka Exp $ */
+/* $Id: query.c,v 1.198.2.13.4.28 2004/05/14 00:59:54 marka Exp $ */
 
 #include <config.h>
 
@@ -1785,7 +1785,7 @@ query_addds(ns_client_t *client, dns_db_t *db, dns_dbnode_t *node) {
 	rdataset = query_newrdataset(client);
 	sigrdataset = query_newrdataset(client);
 	if (rdataset == NULL || sigrdataset == NULL)
-		return;
+		goto cleanup;
 
 	/*
 	 * Look for the DS record, which may or may not be present.