[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.0-91-gd4215fc

[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  d4215fca84ca8ed2319309cf0f41e57c0badc7ff (commit)
       via  5cdd9b460a49645b5a5015729b7decf709236974 (commit)
      from  fd56acd4b3b56c54b97d3715dbeae620a5b4b8a1 (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 d4215fca84ca8ed2319309cf0f41e57c0badc7ff
Author: Victor Julien <victor at inliniac.net>
Date:   Fri May 2 17:11:10 2014 +0200

    http-json: fix coverity warning
    
    *** CID 1211009:  Bad bit shift operation  (BAD_SHIFT)
    /src/output-json-http.c: 265 in JsonHttpLogJSON()
    259         /* log custom fields if configured */
    260         if (http_ctx->fields != 0)
    261         {
    262             HttpField f;
    263             for (f = HTTP_FIELD_ACCEPT; f < HTTP_FIELD_SIZE; f++)
    264             {
    >>>     CID 1211009:  Bad bit shift operation  (BAD_SHIFT)
    >>>     In expression "1 << f", left shifting by more than 31 bits has undefined behavior.  The shift amount, "f", is as much as 46.
    265                 if ((http_ctx->fields & (1<<f)) != 0)
    266                 {
    267                     /* prevent logging a field twice if extended logging is
    268                        enabled */
    269                     if (((http_ctx->flags & LOG_HTTP_EXTENDED) == 0) ||
    270                         ((http_ctx->flags & LOG_HTTP_EXTENDED) !=
    
    ________________________________________________________________________________________________________
    *** CID 1211010:  Bad bit shift operation  (BAD_SHIFT)
    /src/output-json-http.c: 492 in OutputHttpLogInitSub()
    486                         {
    487                             if ((strcmp(http_fields[f].config_field,
    488                                        field->val) == 0) ||
    489                                 (strcasecmp(http_fields[f].htp_field,
    490                                             field->val) == 0))
    491                             {
    >>>     CID 1211010:  Bad bit shift operation  (BAD_SHIFT)
    >>>     In expression "1 << f", left shifting by more than 31 bits has undefined behavior.  The shift amount, "f", is as much as 46.
    492                                 http_ctx->fields |= (1<<f);
    493                                 break;
    494                             }
    495                         }
    496                     }
    497                 }

commit 5cdd9b460a49645b5a5015729b7decf709236974
Author: Victor Julien <victor at inliniac.net>
Date:   Fri May 2 16:32:49 2014 +0200

    unix-socket: reset logging api's properly
    
    Lack of proper reset lead to logs not being written after the first
    pcap had been processed.

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

Summary of changes:
 src/output-json-http.c |    4 ++--
 src/runmodes.c         |   15 ++++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
OISF