3285. [bug] val-frdataset was incorrectly disassociated in

                        proveunsecure after calling startfinddlvsep.
                        [RT #27928]

diff --git a/CHANGES b/CHANGES
index bfb2fba78500337c3bf92cb1e4487a4d1cf82b22..776ca47546c9906e73ecfbe8b1ab3372597603f9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
        --- 9.7.5rc2 released ---
 
+3285.  [bug]           val-frdataset was incorrectly disassociated in
+                       proveunsecure after calling startfinddlvsep.
+                       [RT #27928]
+
 3284.  [bug]           Address race conditions with the handling of
                        rbtnode.deadlink. [RT #27738]
 

diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index 1044ade1fd17b0dae3caba96a55dc23933cecaa5..f765a4f6226147ea44f659f98fc52aaf9e424cfb 100644 (file)
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.c,v 1.182.16.25 2011/11/04 05:34:16 each Exp $ */
+/* $Id: validator.c,v 1.182.16.26 2012/02/15 21:04:21 marka Exp $ */
 
 #include <config.h>
 
@@ -3735,9 +3735,8 @@ proveunsecure(dns_validator_t *val, isc_boolean_t have_ds, isc_boolean_t resume)
                                result = ISC_R_SUCCESS;
                                goto out;
                        }
-                       result = startfinddlvsep(val,
-                                             dns_fixedname_name(&val->fname));
-                       goto out;
+                       return(startfinddlvsep(val,
+                                             dns_fixedname_name(&val->fname)));
                }
                val->labels++;
        }
@@ -3873,8 +3872,7 @@ proveunsecure(dns_validator_t *val, isc_boolean_t have_ds, isc_boolean_t resume)
                                                result = ISC_R_SUCCESS;
                                                goto out;
                                        }
-                                       result = startfinddlvsep(val, tname);
-                                       goto out;
+                                       return(startfinddlvsep(val, tname));
                                }
                                continue;
                        }