[Forensics-changes] [yara] 172/368: Merge pull request #3 from Security513/master

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag v3.5.0
in repository yara.

commit 51470c36f02ec9b9d4376342fdddaf57470ce66b
Merge: ad4beea fa99c83
Author: Coleman Kane <ckane at colemankane.org>
Date:   Fri Feb 19 20:53:31 2016 -0500

    Merge pull request #3 from Security513/master
    
    Merge from master

 Makefile.am                     |   4 +
 README.md                       |   8 +
 docs/capi.rst                   |   6 +
 docs/modules/cuckoo.rst         |   2 +-
 docs/modules/pe.rst             |  47 ++
 extra/logo-small.psd            | Bin 317296 -> 0 bytes
 extra/logo.ai                   | 293 ++++++++++++
 extra/logo.psd                  | Bin 2909856 -> 0 bytes
 extra/logo.svg                  |  65 +++
 libyara/ahocorasick.c           |   3 -
 libyara/arena.c                 |   1 -
 libyara/compiler.c              |   9 +-
 libyara/exception.h             |   2 +-
 libyara/exec.c                  |   5 +
 libyara/filemap.c               |   6 +-
 libyara/grammar.c               | 962 +++++++++++++++++++++-------------------
 libyara/grammar.y               |  40 +-
 libyara/hash.c                  |  19 +-
 libyara/hex_lexer.c             |  63 ++-
 libyara/include/yara.h          |   1 +
 libyara/include/yara/compiler.h |   1 +
 libyara/include/yara/elf.h      |  10 +-
 libyara/include/yara/error.h    |   2 +-
 libyara/include/yara/filemap.h  |   4 +-
 libyara/include/yara/hash.h     |  14 +-
 libyara/include/yara/lexer.h    |   4 +-
 libyara/include/yara/limits.h   |   2 +-
 libyara/include/yara/modules.h  |   3 -
 libyara/include/yara/object.h   |   2 +-
 libyara/include/yara/parser.h   |   5 +-
 libyara/include/yara/pe.h       |  13 +-
 libyara/include/yara/rules.h    |   1 +
 libyara/include/yara/scan.h     |   1 -
 libyara/include/yara/strutils.h |   4 +-
 libyara/include/yara/types.h    |  15 +-
 libyara/include/yara/utils.h    |  10 +-
 libyara/lexer.c                 | 239 +++++-----
 libyara/lexer.l                 |  15 +-
 libyara/libyara.c               |  12 +-
 libyara/mem.c                   |   2 +-
 libyara/modules.c               |  26 +-
 libyara/modules/cuckoo.c        |   2 +-
 libyara/modules/elf.c           |  14 +-
 libyara/modules/hash.c          |  10 +-
 libyara/modules/magic.c         |   6 +
 libyara/modules/math.c          |  10 +-
 libyara/modules/pe.c            | 342 +++++++++++---
 libyara/object.c                |  40 +-
 libyara/parser.c                |  60 ++-
 libyara/proc.c                  |   2 +-
 libyara/re.c                    |  24 +-
 libyara/re_lexer.c              |  67 ++-
 libyara/rules.c                 |  19 +-
 libyara/scan.c                  |  23 +-
 libyara/stream.c                |   6 +-
 libyara/strutils.c              |   2 +-
 tests/test-alignment.c          | 137 ++++++
 threading.c                     |  24 +-
 threading.h                     |   4 +-
 windows/include/jansson.h       |   2 +-
 yara.c                          |  61 ++-
 yara.man                        |  16 +-
 yarac.c                         |   1 -
 63 files changed, 1852 insertions(+), 941 deletions(-)

diff --cc libyara/rules.c
index e3fbdda,189fdf9..637f45d
--- a/libyara/rules.c
+++ b/libyara/rules.c
@@@ -584,11 -575,10 +581,11 @@@ YR_API int yr_rules_scan_fd
      int flags,
      YR_CALLBACK_FUNC callback,
      void* user_data,
 -    int timeout)
 +    int timeout,
 +    unsigned int stacksize)
  {
    YR_MAPPED_FILE mfile;
-   
+ 
    int result = yr_filemap_map_fd(fd, 0, 0, &mfile);
  
    if (result == ERROR_SUCCESS)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git