- remove unused variable assignment from iterator scrub routine.

- check for null in delegation point during iterator refetch
  in forward zone.
- neater pointer cast in libunbound context quit routine.

git-svn-id: file:///svn/unbound/trunk@4902 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 3463096b85769ac7880f439ffad5e76b7636e630..10e05fdbec10e930150e79a217138a451bf0a9ef 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -10,6 +10,10 @@
        - Free memory leak in config strlist append.
        - make sure nsec3 comparison salt is initialized.
        - unit test has clang analysis.
+       - remove unused variable assignment from iterator scrub routine.
+       - check for null in delegation point during iterator refetch
+         in forward zone.
+       - neater pointer cast in libunbound context quit routine.
 
 11 September 2018: Wouter
        - Fixed unused return value warnings in contrib/fastrpz.patch for

diff --git a/iterator/iter_scrub.c b/iterator/iter_scrub.c
index 12580dcdb539578b7cbed562847731ab742bd8fd..b354eaa285b032dd78e6448e923ce268037a5785 100644 (file)
--- a/iterator/iter_scrub.c
+++ b/iterator/iter_scrub.c
@@ -437,7 +437,9 @@ scrub_normalize(sldns_buffer* pkt, struct msg_parse* msg,
                                        rrset->rrset_all_next =
                                                nx->rrset_all_next;
                                        nx->rrset_all_next = rrset;
-                                       prev = nx;
+                                       /* prev = nx; unused, enable if there
+                                        * is other rrset removal code after
+                                        * this */
                                }
                        }
 

diff --git a/iterator/iterator.c b/iterator/iterator.c
index 7f17a99869f6f25737dfa38fb93e84ac1dfe3ba2..bfee82c2361ead3c3cbc31d304d52fbe830d3d93 100644 (file)
--- a/iterator/iterator.c
+++ b/iterator/iterator.c
@@ -1125,7 +1125,7 @@ forward_request(struct module_qstate* qstate, struct iter_qstate* iq)
        struct delegpt* dp;
        uint8_t* delname = iq->qchase.qname;
        size_t delnamelen = iq->qchase.qname_len;
-       if(iq->refetch_glue) {
+       if(iq->refetch_glue && iq->dp) {
                delname = iq->dp->name;
                delnamelen = iq->dp->namelen;
        }

diff --git a/libunbound/context.c b/libunbound/context.c
index 9a35ce56f30fba151635c642f2ee1e8bbc4eb3bb..20e3680ec3bca96079abdda2193ffa1973b87592 100644 (file)
--- a/libunbound/context.c
+++ b/libunbound/context.c
@@ -392,12 +392,12 @@ struct ctx_query* context_deserialize_cancel(struct ub_ctx* ctx,
 uint8_t* 
 context_serialize_quit(uint32_t* len)
 {
-       uint8_t* p = (uint8_t*)malloc(sizeof(uint32_t));
+       uint32_t* p = (uint32_t*)malloc(sizeof(uint32_t));
        if(!p)
                return NULL;
        *len = sizeof(uint32_t);
        sldns_write_uint32(p, UB_LIBCMD_QUIT);
-       return p;
+       return (uint8_t*)p;
 }
 
 enum ub_ctx_cmd context_serial_getcmd(uint8_t* p, uint32_t len)