- Fix sldns with static checking fixes copied from getdns.

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

diff --git a/doc/Changelog b/doc/Changelog
index cb29d1c17d2c8d1bf47076b16c70fe0d11d8d798..e349e84a03e426221ec0210db8ad478e28af949f 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+29 April 2016: Wouter
+       - Fix sldns with static checking fixes copied from getdns.
+
 28 April 2016: Wouter
        - Fix #759: 0x20 capsforid no longer checks type PTR, for
          compatibility with cisco dns guard.  This lowers false positives.

diff --git a/sldns/keyraw.c b/sldns/keyraw.c
index 59e8000f5abf33dcbccb72a9a83cffc948c856ce..8d28bf40ab325d34c6ed5de224f53af5be150a6f 100644 (file)
--- a/sldns/keyraw.c
+++ b/sldns/keyraw.c
@@ -206,7 +206,6 @@ sldns_key_buf2dsa_raw(unsigned char* key, size_t len)
        offset += length;
 
        Y = BN_bin2bn(key+offset, (int)length, NULL);
-       offset += length;
 
        /* create the key and set its properties */
        if(!Q || !P || !G || !Y || !(dsa = DSA_new())) {

diff --git a/sldns/parseutil.c b/sldns/parseutil.c
index 2a2ebbb08c38e44640a3c9dcccb3bccc4eb05246..32717616aa4afbc9d8dca13d39bc205c76d9e230 100644 (file)
--- a/sldns/parseutil.c
+++ b/sldns/parseutil.c
@@ -637,7 +637,7 @@ int sldns_b64_ntop(uint8_t const *src, size_t srclength,
                target[o+1] = b64[ ((src[i]&0x03)<<4) | (src[i+1]>>4) ];
                target[o+2] = b64[ ((src[i+1]&0x0f)<<2) ];
                target[o+3] = pad64;
-               i += 2;
+               /* i += 2; */
                o += 4;
                break;
        case 1:
@@ -646,7 +646,7 @@ int sldns_b64_ntop(uint8_t const *src, size_t srclength,
                target[o+1] = b64[ ((src[i]&0x03)<<4) ];
                target[o+2] = pad64;
                target[o+3] = pad64;
-               i += 1;
+               /* i += 1; */
                o += 4;
                break;
        case 0:

diff --git a/sldns/str2wire.c b/sldns/str2wire.c
index c54108332d15ae911ffe810341058e32e6602dd3..e624e269e33e737d051b78f786f9cbeb41d4c1ea 100644 (file)
--- a/sldns/str2wire.c
+++ b/sldns/str2wire.c
@@ -892,10 +892,10 @@ int sldns_fp2wire_rr_buf(FILE* in, uint8_t* rr, size_t* len, size_t* dname_len,
                        parse_state?parse_state->default_ttl:0,
                        (parse_state&&parse_state->origin_len)?
                                parse_state->origin:NULL,
-                       parse_state->origin_len,
+                       parse_state?parse_state->origin_len:0,
                        (parse_state&&parse_state->prev_rr_len)?
                                parse_state->prev_rr:NULL,
-                       parse_state->prev_rr_len);
+                       parse_state?parse_state->prev_rr_len:0);
        }
        return LDNS_WIREPARSE_ERR_OK;
 }