small memory fix and small indentation fix

diff --git a/Changelog b/Changelog
index f30081234981d6855d097616e893caff35508797..52947da0eab49da9096503654dac663674076b99 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -5,9 +5,12 @@
        * signing no longer signs every rrset with KSK's, but only the DNSKEY rrset
        * ported to Solaris 10
         * LOC RR type has been fixed
+       * added ldns_send_buffer() function
 
        Drill:
        * drill prints error on failed axfr.
+       * drill now accepts mangled packets with -f
+
 
 31 Apr 2006: 1.1.0: ldns-team
        * Added tutorials and an introduction to the documentation

diff --git a/drill/chasetrace.c b/drill/chasetrace.c
index 4e278dd0e567b1d0e667eaebb3c8f2c191f290c6..eca22dbb36a4d59de75f52e0ab5ee16ba04bba98 100644 (file)
--- a/drill/chasetrace.c
+++ b/drill/chasetrace.c
@@ -531,9 +531,9 @@ do_chase(ldns_resolver *res, ldns_rdf *name, ldns_rr_type type, ldns_rr_class c,
                                /* nsec has nothing to do with this data */
                        }
                }
-               ldns_pkt_free(pkt);
                ldns_rr_list_deep_free(nsecs);
 #endif
+               ldns_pkt_free(pkt);
                return result;
        }
 }

diff --git a/drill/securetrace.c b/drill/securetrace.c
index c9bf29beced9817668efb5e103fce51154e209dc..2016783128d827586de048de1eb090da0f12e4f7 100644 (file)
--- a/drill/securetrace.c
+++ b/drill/securetrace.c
@@ -584,7 +584,7 @@ do_secure_trace(ldns_resolver *local_res, ldns_rdf *name, ldns_rr_type t,
                                        }
                                }
                        }
-
+                       ldns_rr_list_deep_free(ds_list);
                        ldns_pkt_free(p);
                } else {
                        /* if this is the last label, just verify the data and stop */
@@ -610,9 +610,11 @@ do_secure_trace(ldns_resolver *local_res, ldns_rdf *name, ldns_rr_type t,
                                        fprintf(stdout, "%s ", UNSIGNED);
                                        ldns_rr_list_print(stdout, dataset);
                                }
+                               ldns_rr_list_deep_free(dataset);
                        } else {
                                mesg("No DS");
                        }
+                       ldns_pkt_free(p);
                }
                ds_list = NULL;
                new_nss_aaaa = NULL;

diff --git a/rr.c b/rr.c
index 073b9e4c33e0e45896a83b8d105ab7337a53e33a..dc7d846075efa1dbf894a76eea94d211d497668a 100644 (file)
--- a/rr.c
+++ b/rr.c
@@ -1254,20 +1254,20 @@ ldns_rr_compare(const ldns_rr *rr1, const ldns_rr *rr2)
         }
 
         /* convert RRs into canonical wire format */
-               rr1_buf = ldns_buffer_new(rr1_len);
-               rr2_buf = ldns_buffer_new(rr2_len);
-        min_len = (rr1_len < rr2_len) ? rr1_len : rr2_len;
-
-               if (ldns_rr2buffer_wire(rr1_buf, rr1, LDNS_SECTION_ANY) != LDNS_STATUS_OK) {
-                       ldns_buffer_free(rr1_buf);
-                       ldns_buffer_free(rr2_buf);
-                       return 0; 
-               }
-               if (ldns_rr2buffer_wire(rr2_buf, rr2, LDNS_SECTION_ANY) != LDNS_STATUS_OK) {
-                       ldns_buffer_free(rr1_buf);
-                       ldns_buffer_free(rr2_buf);
-                       return 0;
-               }
+       rr1_buf = ldns_buffer_new(rr1_len);
+       rr2_buf = ldns_buffer_new(rr2_len);
+       min_len = (rr1_len < rr2_len) ? rr1_len : rr2_len;
+
+       if (ldns_rr2buffer_wire(rr1_buf, rr1, LDNS_SECTION_ANY) != LDNS_STATUS_OK) {
+               ldns_buffer_free(rr1_buf);
+               ldns_buffer_free(rr2_buf);
+               return 0; 
+       }
+       if (ldns_rr2buffer_wire(rr2_buf, rr2, LDNS_SECTION_ANY) != LDNS_STATUS_OK) {
+               ldns_buffer_free(rr1_buf);
+               ldns_buffer_free(rr2_buf);
+               return 0;
+       }
 
         /* Compare RRs RDATA byte for byte. */
         for(i = offset; i < min_len; i++) {