Some memory leaks that came out of review

diff --git a/str2host.c b/str2host.c
index 5095232d6b3ac715121c2152733f7c1b6afb3ae3..8a325921bc6eb88fdca7f3a9d3d87fe5d438bacf 100644 (file)
--- a/str2host.c
+++ b/str2host.c
@@ -1830,6 +1830,7 @@ ldns_str2rdf_amtrelay(ldns_rdf **rd, const char *str)
                        LDNS_FREE(relay);
                LDNS_FREE(token);
                ldns_buffer_free(str_buf);
+               ldns_rdf_deep_free(relay_rdf);
                return LDNS_STATUS_INVALID_STR;
        }
 
@@ -1845,7 +1846,7 @@ ldns_str2rdf_amtrelay(ldns_rdf **rd, const char *str)
                        LDNS_FREE(relay);
                LDNS_FREE(token);
                ldns_buffer_free(str_buf);
-               if (relay_rdf) ldns_rdf_free(relay_rdf);
+               ldns_rdf_deep_free(relay_rdf);
                return LDNS_STATUS_MEM_ERR;
        }
 
@@ -1864,7 +1865,7 @@ ldns_str2rdf_amtrelay(ldns_rdf **rd, const char *str)
                LDNS_FREE(relay);
        LDNS_FREE(token);
        ldns_buffer_free(str_buf);
-       ldns_rdf_free(relay_rdf);
+       ldns_rdf_deep_free(relay_rdf);
        LDNS_FREE(data);
        if(!*rd) return LDNS_STATUS_MEM_ERR;
        return LDNS_STATUS_OK;

diff --git a/zone.c b/zone.c
index 9a5d4c4e9e12f0b7ee15eb71a5465d5abcd6971f..dc09900624daaccb260e2e2640930057788dcf59 100644 (file)
--- a/zone.c
+++ b/zone.c
@@ -350,7 +350,7 @@ error:
                ldns_rdf_deep_free(my_prev);
        }
        if (newzone) {
-               ldns_zone_free(newzone);
+               ldns_zone_deep_free(newzone);
        }
        return ret;
 }