From aa51dd3b92082c829cc1b49eae485891ea2d170b Mon Sep 17 00:00:00 2001
From: Anton Lavrentiev via Cygwin-patches <cygwin-patches@cygwin.com>
Date: Tue, 18 Jan 2022 19:07:55 -0500
Subject: [PATCH] Cygwin: resolver: A few fixes for cygwin_query(), part 2

Make sure Windows ResultSet is free'd when dn_comp failed internally
---
 winsup/cygwin/libc/minires-os-if.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/winsup/cygwin/libc/minires-os-if.c b/winsup/cygwin/libc/minires-os-if.c
index dce856076..cd56be45c 100644
--- a/winsup/cygwin/libc/minires-os-if.c
+++ b/winsup/cygwin/libc/minires-os-if.c
@@ -246,8 +246,7 @@ static int cygwin_query(res_state statp, const char * DomName, int Class, int Ty
       statp->res_h_errno = NO_RECOVERY;
       break;
     }
-    len = -1;
-    goto done;
+    return -1;
   }
 
   ptr = AnsPtr + HFIXEDSZ; /* Skip header */
@@ -293,10 +292,12 @@ static int cygwin_query(res_state statp, const char * DomName, int Class, int Ty
     rr = rr->pNext;
   }
 
+  len = ptr - AnsPtr;
+
+done:
+
   DnsFree(pQueryResultsSet, DnsFreeRecordList);
 
-  len = ptr - AnsPtr;
-done:
   if (HFIXEDSZ <= AnsLength) {
     ptr = AnsPtr;
     PUTSHORT(Id, ptr);