[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-3.0.1RC1-24-gba035e6

[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  ba035e601e6f5d56a9ce2c5bbb4bb2c2c80d2eca (commit)
       via  2ccf028eac9ed88fe16a6f7d473ae97c4062732a (commit)
       via  070a35fd3b2aad730f70331ddbd338440af675d6 (commit)
       via  d05883af9bae17e5fe915e1491ebe486c030dbc2 (commit)
       via  06dcaec335cf6b07d4759ca086915997b9b56c81 (commit)
      from  ffb5498228a731ef1775408dfc0a5c1676777a66 (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 ba035e601e6f5d56a9ce2c5bbb4bb2c2c80d2eca
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Mar 31 10:07:01 2016 +0200

    hyperscan: fix minor coverity warning 1358023
    
    *** CID 1358023:  Null pointer dereferences  (REVERSE_INULL)
    /src/util-mpm-hs.c: 860 in SCHSDestroyThreadCtx()
    854         if (thr_ctx->scratch != NULL) {
    855             hs_free_scratch(thr_ctx->scratch);
    856             mpm_thread_ctx->memory_cnt--;
    857             mpm_thread_ctx->memory_size -= thr_ctx->scratch_size;
    858         }
    859
    >>>     CID 1358023:  Null pointer dereferences  (REVERSE_INULL)
    >>>     Null-checking "mpm_thread_ctx->ctx" suggests that it may be null, but it has already been dereferenced on all paths leading to the check.
    860         if (mpm_thread_ctx->ctx != NULL) {
    861             SCFree(mpm_thread_ctx->ctx);
    862             mpm_thread_ctx->ctx = NULL;
    863             mpm_thread_ctx->memory_cnt--;
    864             mpm_thread_ctx->memory_size -= sizeof(SCHSThreadCtx);
    865         }

commit 2ccf028eac9ed88fe16a6f7d473ae97c4062732a
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Mar 31 10:04:44 2016 +0200

    hyperscan: fix minor coverity warning 1358024
    
    *** CID 1358024:  Null pointer dereferences  (REVERSE_INULL)
    /src/util-mpm-hs.c: 1043 in SCHSPrintInfo()
    1037         printf("  SCHSPattern    %" PRIuMAX "\n", (uintmax_t)sizeof(SCHSPattern));
    1038         printf("Unique Patterns: %" PRIu32 "\n", mpm_ctx->pattern_cnt);
    1039         printf("Smallest:        %" PRIu32 "\n", mpm_ctx->minlen);
    1040         printf("Largest:         %" PRIu32 "\n", mpm_ctx->maxlen);
    1041         printf("\n");
    1042
    >>>     CID 1358024:  Null pointer dereferences  (REVERSE_INULL)
    >>>     Null-checking "ctx" suggests that it may be null, but it has already been dereferenced on all paths leading to the check.
    1043         if (ctx) {
    1044             char *db_info = NULL;
    1045             if (hs_database_info(pd->hs_db, &db_info) == HS_SUCCESS) {
    1046                 printf("HS Database Info: %s\n", db_info);
    1047                 SCFree(db_info);
    1048             }

commit 070a35fd3b2aad730f70331ddbd338440af675d6
Author: browner87 <browner87 at users.noreply.github.com>
Date:   Thu Mar 24 12:55:34 2016 -0400

    source-pcap-file: fix stats not being reset
    
    Fix for redmine #1737. Clears stats between each scanned PCAP instead of just
    on load in Unix socket mode.

commit d05883af9bae17e5fe915e1491ebe486c030dbc2
Author: browner87 <browner87 at users.noreply.github.com>
Date:   Wed Mar 23 11:05:05 2016 -0400

    Fix for redmine bug 1737
    
    PCAP stats not reset between files in Unix socket mode. Added a memset to the Global Init function to clear these stats.

commit 06dcaec335cf6b07d4759ca086915997b9b56c81
Author: Jason Ish <ish at unx.ca>
Date:   Wed Mar 30 08:46:30 2016 -0600

    byte-extract: for string, default to base "dec" if not provided
    
    For Snort compatibility, as Snort defaults to "dec" if not provided.
    
    Fixed issue 1697:
    https://redmine.openinfosecfoundation.org/issues/1697

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

Summary of changes:
 src/detect-byte-extract.c | 50 ++++++++++++++++++++++++++++++++++++++++++-----
 src/source-pcap-file.c    |  3 +--
 src/util-mpm-hs.c         | 16 +++++++--------
 3 files changed, 54 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
OISF