[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-1.4beta2-36-gfd6df00

[noreply at openinfosecfoundation.org]

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  fd6df00684a503b69d303d6cffe2b6ba5ffbd531 (commit)
       via  ea6fcb355b25be3eff4d543830228186d76daf58 (commit)
       via  fdab6f2ab16bc49ac425ed97a803fdc1b0bd925e (commit)
       via  00b95c69c0130f5c48d30c54e3849ff5bc58f1d1 (commit)
       via  83ffd1f7432c5f83833e8a53b206db5e96556905 (commit)
      from  2ab62920aa2585888af049721e36dc018e24f1e6 (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 fd6df00684a503b69d303d6cffe2b6ba5ffbd531
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Oct 25 13:39:13 2012 +0200

    Bug 585: use per detect thread libmagic ctx

commit ea6fcb355b25be3eff4d543830228186d76daf58
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Oct 24 17:51:35 2012 +0200

    magic: add test showing payload resulting in libmagic invalid read as reported by valgrind.

commit fdab6f2ab16bc49ac425ed97a803fdc1b0bd925e
Author: Anoop Saldanha <anoopsaldanha at gmail.com>
Date:   Sat Oct 20 20:01:52 2012 +0530

    fix flow deadlock issue in detection engine state introduced by tx api.
    
    Issue discovered by coverity.

commit 00b95c69c0130f5c48d30c54e3849ff5bc58f1d1
Author: Eric Leblond <eric at regit.org>
Date:   Tue Oct 23 10:31:10 2012 +0200

    suricata: list-keywords does not depend on unittest

commit 83ffd1f7432c5f83833e8a53b206db5e96556905
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Oct 23 17:10:36 2012 +0200

    luajit: suppress compiler warning

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

Summary of changes:
 src/detect-engine-state.c |    4 +-
 src/detect-engine.c       |   15 +++++-
 src/detect-filemagic.c    |  128 ++++++++++++++++++++++++++++++++++++++++++--
 src/detect-filemagic.h    |    8 +++-
 src/detect-luajit.c       |    3 +-
 src/detect.h              |    2 +-
 src/log-file.c            |    2 +-
 src/log-filestore.c       |    2 +-
 src/suricata.c            |    2 +-
 src/util-magic.c          |   76 ++++++++++++++++++++++++---
 src/util-magic.h          |    5 ++-
 11 files changed, 223 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
OISF