Better sbuffer assertion.

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

diff --git a/sldns/sbuffer.h b/sldns/sbuffer.h
index 55da9b1c55174bb262aff9e7d9c83e1bf9f32d82..2241640ddb122b6cb5f2da6f7c9f0a6adf430d6d 100644 (file)
--- a/sldns/sbuffer.h
+++ b/sldns/sbuffer.h
@@ -160,7 +160,7 @@ sldns_buffer_invariant(sldns_buffer *buffer)
        assert(buffer != NULL);
        assert(buffer->_position <= buffer->_limit || buffer->_vfixed);
        assert(buffer->_limit <= buffer->_capacity);
-       assert(buffer->_data != NULL || (buffer->_vfixed && buffer->_capacity == 0));
+       assert(buffer->_data != NULL || (buffer->_vfixed && buffer->_capacity == 0 && buffer->_limit == 0));
 }
 #endif
 

diff --git a/testcode/fake_event.c b/testcode/fake_event.c
index 0c1f3d077ebb274c44fcd49a52eadb26d8fc5545..777ed7355ed770fe0ce37297b66d6728c1140668 100644 (file)
--- a/testcode/fake_event.c
+++ b/testcode/fake_event.c
@@ -1195,7 +1195,6 @@ struct serviced_query* outnet_serviced_query(struct outside_network* outnet,
        /* create packet with EDNS */
        pend->buffer = sldns_buffer_new(512);
        log_assert(pend->buffer);
-       log_assert(pend->buffer->_data);
        sldns_buffer_write_u16(pend->buffer, 0); /* id */
        sldns_buffer_write_u16(pend->buffer, flags);
        sldns_buffer_write_u16(pend->buffer, 1); /* qdcount */

diff --git a/testcode/perf.c b/testcode/perf.c
index e4d0d7944386e7f2e7abb545285e7703de1f5075..32a5307edb1587b4ad78b28113e2af1295471309 100644 (file)
--- a/testcode/perf.c
+++ b/testcode/perf.c
@@ -532,7 +532,6 @@ qlist_add_line(struct perfinfo* info, char* line, int no)
                printf("error parsing query %d: %s\n", no, line);
                exit(1);
        }
-       log_assert(info->buf->_data);
        sldns_buffer_write_u16_at(info->buf, 0, (uint16_t)info->qlist_size); 
        if(info->qlist_size + 1 > info->qlist_capacity) {
                qlist_grow_capacity(info);

diff --git a/testcode/pktview.c b/testcode/pktview.c
index 976c69e062e66b177a11b9b325bbaf9b21c5f672..12e0d8edbb68ff28e704d6f283c48145a92d3913 100644 (file)
--- a/testcode/pktview.c
+++ b/testcode/pktview.c
@@ -155,7 +155,6 @@ static void analyze(sldns_buffer* pkt)
 {
        uint16_t i, f, qd, an, ns, ar;
        int rrnum = 0;
-       log_assert(pkt && pkt->_data);
        printf("packet length %d\n", (int)sldns_buffer_limit(pkt));
        if(sldns_buffer_limit(pkt) < 12) return;