[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.1beta1-178-g27007cc

[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  27007cc7d5c559d12bb15018f43a8006b6bffeca (commit)
       via  7c3b22da22d917104e266430c86d5b8b936d94ae (commit)
       via  f7c2c219cd4b268a4bbb105dbd14e1d0b36b8ea0 (commit)
      from  9d2a0c39e543d35c81cd66c5bd424750a938e888 (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 27007cc7d5c559d12bb15018f43a8006b6bffeca
Author: Victor Julien <victor at inliniac.net>
Date:   Fri Oct 31 14:56:14 2014 +0100

    Fix Coverity issue in SMTP output
    
    ** CID 1250327:  Uninitialized pointer read  (UNINIT)
    /src/output-json-email-common.c: 117 in JsonEmailLogJson()
    /src/output-json-email-common.c: 139 in JsonEmailLogJson()

commit 7c3b22da22d917104e266430c86d5b8b936d94ae
Author: Victor Julien <victor at inliniac.net>
Date:   Fri Oct 31 14:53:38 2014 +0100

    smtp: don't create a new tx for rset/quit
    
    A tx is considered complete after the data command completed. However,
    this would lead to RSET and QUIT commands setting up a new tx.
    
    This patch simply adds a check that refuses to setup a new tx when these
    commands are encountered after the data portion is complete.

commit f7c2c219cd4b268a4bbb105dbd14e1d0b36b8ea0
Author: Victor Julien <victor at inliniac.net>
Date:   Fri Oct 31 13:41:39 2014 +0100

    filestore: fix crash if keyword setup fails
    
    SigMatch would be added to list, then the alproto check failed, leading
    to freeing of sm. But as it was still in the list, the list now contained
    a dangling pointer.

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

Summary of changes:
 src/app-layer-smtp.c           |   17 ++++++++++++++++-
 src/detect-filestore.c         |    6 +++---
 src/output-json-email-common.c |    4 ++--
 3 files changed, 21 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
OISF