[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-3.1.1-49-g2997d08

[OISF Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OISF".

The branch, master has been updated
       via  2997d086bea41349d05fcff176afd15ebd1d09ef (commit)
       via  1cc5f9825de1b866b3e153ac1cf8028308e8cdb0 (commit)
       via  bbcc22d2ad8e99e377a4d713de251d08a4cf15b2 (commit)
      from  b4565004c7f7585e69e29d5e11b5d28bb66125fa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2997d086bea41349d05fcff176afd15ebd1d09ef
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Sep 6 11:29:09 2016 +0200

    eve-drop: allow logging all drops
    
    - drop:
        alerts: yes      # log alerts that caused drops
        flows: all       # start or all: 'start' logs only a single drop
                         # per flow direction. All logs each dropped pkt.

commit 1cc5f9825de1b866b3e153ac1cf8028308e8cdb0
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Sep 6 10:29:57 2016 +0200

    dns: use nonnull attr for log functions

commit bbcc22d2ad8e99e377a4d713de251d08a4cf15b2
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Sep 6 10:20:38 2016 +0200

    dns: fix coverity warning
    
    ** CID 1372324:  Null pointer dereferences  (FORWARD_NULL)
    /src/output-json-dns.c: 532 in OutputAnswer()
    
    ________________________________________________________________________________________________________
    *** CID 1372324:  Null pointer dereferences  (FORWARD_NULL)
    /src/output-json-dns.c: 532 in OutputAnswer()
    526             }
    527         }
    528
    529         /* reset */
    530         MemBufferReset(aft->buffer);
    531         json_object_set_new(djs, "dns", js);
    >>>     CID 1372324:  Null pointer dereferences  (FORWARD_NULL)
    >>>     Dereferencing null pointer "entry".
    532         if (likely(DNSRRTypeEnabled(entry->type, aft->dnslog_ctx->flags))) {
    533             OutputJSONBuffer(djs, aft->dnslog_ctx->file_ctx, &aft->buffer);
    534         }
    535         json_object_del(djs, "dns");
    536
    537         return;
    
    Move checks to the top of the functions. Should be more efficient too.

-----------------------------------------------------------------------

Summary of changes:
 src/output-json-dns.c  | 176 ++++++++++++++++++++++++++-----------------------
 src/output-json-drop.c |  30 ++++++++-
 suricata.yaml.in       |   4 +-
 3 files changed, 127 insertions(+), 83 deletions(-)


hooks/post-receive
-- 
OISF