[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.1beta4-156-ge583de0

[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  e583de05823c51694cb443d326e7b0ed13cb457e (commit)
       via  f4f53924bbe702649ffd21764cf26e118a65e016 (commit)
       via  6c792cb4cc7309a9e925e30322bda9c4d6facab7 (commit)
       via  b8211e8c04f25947ee3bbb1473e8ff75920c9c46 (commit)
       via  bd73553027a3a77815d09457a899791bbe8a76ff (commit)
       via  1ed8d7b53842d825ada15dd3f295c6f9e76fc402 (commit)
       via  dd2afd51f7cabc11a6303f14d7ef99c125ea0b05 (commit)
       via  bcff35fd9f86da0f863e4b43fa81b56fc89e602d (commit)
      from  aa095864d3a8bae4364a8a50a5793fe7e02d1e0a (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 e583de05823c51694cb443d326e7b0ed13cb457e
Author: Victor Julien <victor at inliniac.net>
Date:   Fri Jun 19 14:39:44 2015 +0200

    Minor unittest cleanups

commit f4f53924bbe702649ffd21764cf26e118a65e016
Author: Victor Julien <victor at inliniac.net>
Date:   Fri Jun 19 13:39:30 2015 +0200

    app-layer: fix coverity warnings

commit 6c792cb4cc7309a9e925e30322bda9c4d6facab7
Author: Victor Julien <victor at inliniac.net>
Date:   Fri Jun 19 13:09:36 2015 +0200

    erspan: respect vlan.use-for-tracking setting

commit b8211e8c04f25947ee3bbb1473e8ff75920c9c46
Author: Victor Julien <victor at inliniac.net>
Date:   Fri Jun 19 13:05:49 2015 +0200

    htp: hide BUG_ON's behind DEBUG_VALIDATION

commit bd73553027a3a77815d09457a899791bbe8a76ff
Author: Victor Julien <victor at inliniac.net>
Date:   Fri Jun 19 13:02:29 2015 +0200

    smtp json: fix potential crash on malloc failure
    
    ** CID 1298888:    (FORWARD_NULL)
    /src/output-json-email-common.c: 117 in JsonEmailLogJson()
    /src/output-json-email-common.c: 140 in JsonEmailLogJson()

commit 1ed8d7b53842d825ada15dd3f295c6f9e76fc402
Author: Victor Julien <victor at inliniac.net>
Date:   Fri Jun 19 12:50:05 2015 +0200

    detect analizer: fix minor coverity warning
    
    ** CID 1298889:  Integer handling issues  (NEGATIVE_RETURNS)
    /src/detect-engine-analyzer.c: 102 in EngineAnalysisFP()

commit dd2afd51f7cabc11a6303f14d7ef99c125ea0b05
Author: Victor Julien <victor at inliniac.net>
Date:   Fri Jun 19 12:42:57 2015 +0200

    file_data smtp: fix minor coverity warning
    
    CID 1298891:  Null pointer dereferences  (REVERSE_INULL)
    Null-checking "curr_file" suggests that it may be null, but it has already been dereferenced on all paths leading to the check.

commit bcff35fd9f86da0f863e4b43fa81b56fc89e602d
Author: Victor Julien <victor at inliniac.net>
Date:   Fri Jun 19 12:38:37 2015 +0200

    smb: fix coverity warning
    
    ** CID 1298892:  Incorrect expression  (UNUSED_VALUE)
    /src/app-layer-smb.c: 1486 in SMBProbingParser()

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

Summary of changes:
 src/app-layer-dcerpc-udp.c        |  2 ++
 src/app-layer-dcerpc.c            |  2 ++
 src/app-layer-dns-tcp.c           |  2 +-
 src/app-layer-ftp.c               |  2 ++
 src/app-layer-htp.c               |  4 +++
 src/app-layer-modbus.c            |  4 +++
 src/app-layer-smb.c               |  2 +-
 src/app-layer-smb2.c              |  2 ++
 src/app-layer-smtp.c              |  2 ++
 src/app-layer-ssh.c               |  4 +++
 src/app-layer-ssl.c               |  2 ++
 src/decode-erspan.c               |  5 +--
 src/detect-engine-analyzer.c      |  3 ++
 src/detect-engine-filedata-smtp.c | 70 +++++++++++++++++++--------------------
 src/host-bit.c                    |  1 -
 src/ippair-bit.c                  |  1 -
 src/log-droplog.c                 |  8 -----
 src/output-json-email-common.c    | 40 ++++++++++++----------
 18 files changed, 88 insertions(+), 68 deletions(-)


hooks/post-receive
-- 
OISF