bugfix #1569: Possible NULL pointer dereference

Thanks Bill Parker

diff --git a/Changelog b/Changelog
index a86c7673a013892deda19af6ff2105121e278692..45f03691cb07b06e3490e6db4ad9e187ebee4aa9 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,5 @@
 1.7.1  ????-??-??
-       * bugfix #1566, #1568: Possible NULL Pointer Dereference
+       * bugfix #1566, #1568, #1569: Possible NULL Pointer Dereferences
          Thanks Bill Parker
        * bugfix #1260: Anticipate strchr returning NULL on unfound char
          Thanks Stephan Zeisberg

diff --git a/resolver.c b/resolver.c
index a082379d7931e3b8d6fd62006818729cacec0625..2be9e395fb43168b5254c6a643fc5853e6626329 100644 (file)
--- a/resolver.c
+++ b/resolver.c
@@ -1180,6 +1180,7 @@ ldns_resolver_backup_rtt(ldns_resolver *r)
        if (old_rtt && ldns_resolver_nameserver_count(r)) {
                new_rtt = LDNS_XMALLOC(size_t
                                , ldns_resolver_nameserver_count(r));
+               if (!new_rtt) return NULL;
                memcpy(new_rtt, old_rtt, sizeof(size_t)
                                * ldns_resolver_nameserver_count(r));
                ldns_resolver_set_rtt(r, new_rtt);