[Forensics-changes] [yara] 70/407: Merge branch 'master' into richpe

[Hilko Bengen]

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

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

commit cde939e85166933171136b26db2473db07c057b4
Merge: 362c667 7e99c64
Author: Wesley Shields <wxs at atarininja.org>
Date:   Thu Sep 25 16:34:31 2014 -0400

    Merge branch 'master' into richpe
    
    Conflicts:
    	libyara/include/yara/exec.h

 Makefile.am                  |   2 +-
 configure.ac                 |   6 ++-
 libyara/atoms.c              |  56 ++++++++++++++++-----
 libyara/exec.c               |  28 ++++++++---
 libyara/grammar.c            |   8 +--
 libyara/grammar.y            |   8 +--
 libyara/include/yara/atoms.h |   8 +++
 libyara/include/yara/exec.h  | 114 ++++++++++++++++++++++---------------------
 libyara/include/yara/pe.h    |   5 --
 libyara/modules/pe.c         |  19 +++++---
 libyara/parser.c             |  38 +++++----------
 yara-python/tests.py         |   3 +-
 yara-python/yara-python.c    |  24 ++++-----
 13 files changed, 181 insertions(+), 138 deletions(-)

diff --cc libyara/include/yara/exec.h
index 9dfea1b,83f5c36..e3ea9e0
--- a/libyara/include/yara/exec.h
+++ b/libyara/include/yara/exec.h
@@@ -30,62 -30,62 +30,64 @@@ limitations under the License
  
  #define OP_AND            1
  #define OP_OR             2
- #define OP_XOR            3
- #define OP_NOT            4
- #define OP_LT             5
- #define OP_GT             6
- #define OP_LE             7
- #define OP_GE             8
- #define OP_EQ             9
- #define OP_NEQ            10
- #define OP_SZ_EQ          11
- #define OP_SZ_NEQ         12
- #define OP_SZ_TO_BOOL     13
- #define OP_ADD            14
- #define OP_SUB            15
- #define OP_MUL            16
- #define OP_DIV            17
- #define OP_MOD            18
- #define OP_NEG            19
- #define OP_SHL            20
- #define OP_SHR            21
- #define OP_PUSH           22
- #define OP_POP            23
- #define OP_CALL           24
- #define OP_OBJ_LOAD       25
- #define OP_OBJ_VALUE      26
- #define OP_OBJ_FIELD      27
- #define OP_INDEX_ARRAY    28
- #define OP_STR_COUNT      29
- #define OP_STR_FOUND      30
- #define OP_STR_FOUND_AT   31
- #define OP_STR_FOUND_IN   32
- #define OP_STR_OFFSET     33
- #define OP_OF             34
- #define OP_PUSH_RULE      35
- #define OP_MATCH_RULE     36
- #define OP_INCR_M         37
- #define OP_CLEAR_M        38
- #define OP_ADD_M          39
- #define OP_POP_M          40
- #define OP_PUSH_M         41
- #define OP_SWAPUNDEF      42
- #define OP_JNUNDEF        43
- #define OP_JLE            44
- #define OP_FILESIZE       45
- #define OP_ENTRYPOINT     46
- #define OP_INT8           47
- #define OP_INT16          48
- #define OP_INT32          49
- #define OP_UINT8          50
- #define OP_UINT16         51
- #define OP_UINT32         52
- #define OP_CONTAINS       53
- #define OP_MATCHES        54
- #define OP_IMPORT         55
- #define OP_LOOKUP_DICT    56
- #define OP_CONTAINS_STR   57
- #define OP_MATCHES_STR    58
+ #define OP_NOT            3
+ #define OP_LT             4
+ #define OP_GT             5
+ #define OP_LE             6
+ #define OP_GE             7
+ #define OP_EQ             8
+ #define OP_NEQ            9
+ #define OP_SZ_EQ          10
+ #define OP_SZ_NEQ         11
+ #define OP_SZ_TO_BOOL     12
+ #define OP_ADD            13
+ #define OP_SUB            14
+ #define OP_MUL            15
+ #define OP_DIV            16
+ #define OP_MOD            17
+ #define OP_BITWISE_NOT    18
+ #define OP_BITWISE_AND    19
+ #define OP_BITWISE_OR     20
+ #define OP_BITWISE_XOR    21
+ #define OP_SHL            22
+ #define OP_SHR            23
+ #define OP_PUSH           24
+ #define OP_POP            25
+ #define OP_CALL           26
+ #define OP_OBJ_LOAD       27
+ #define OP_OBJ_VALUE      28
+ #define OP_OBJ_FIELD      29
+ #define OP_INDEX_ARRAY    30
+ #define OP_STR_COUNT      31
+ #define OP_STR_FOUND      32
+ #define OP_STR_FOUND_AT   33
+ #define OP_STR_FOUND_IN   34
+ #define OP_STR_OFFSET     35
+ #define OP_OF             36
+ #define OP_PUSH_RULE      37
+ #define OP_MATCH_RULE     38
+ #define OP_INCR_M         39
+ #define OP_CLEAR_M        40
+ #define OP_ADD_M          41
+ #define OP_POP_M          42
+ #define OP_PUSH_M         43
+ #define OP_SWAPUNDEF      44
+ #define OP_JNUNDEF        45
+ #define OP_JLE            46
+ #define OP_FILESIZE       47
+ #define OP_ENTRYPOINT     48
+ #define OP_INT8           49
+ #define OP_INT16          50
+ #define OP_INT32          51
+ #define OP_UINT8          52
+ #define OP_UINT16         53
+ #define OP_UINT32         54
+ #define OP_CONTAINS       55
+ #define OP_MATCHES        56
+ #define OP_IMPORT         57
+ #define OP_LOOKUP_DICT    58
++#define OP_CONTAINS_STR   59
++#define OP_MATCHES_STR    60
  
  
  #define OPERATION(operator, op1, op2) \
diff --cc libyara/modules/pe.c
index 7e3b7c8,9318cfb..4b698f8
--- a/libyara/modules/pe.c
+++ b/libyara/modules/pe.c
@@@ -2082,13 -389,16 +2084,16 @@@ int pe_find_version_info_cb
            strlcpy_w(key, string->Key, sizeof(key));
            strlcpy_w(value, string_value, sizeof(value));
  
 -          set_string(value, pe->object, "version_info[%s]", key);
 +          set_string(value, sizeof(value), pe->object, "version_info[%s]", key);
  
+           if (string->Length == 0)
+             break;
+ 
            string = ADD_OFFSET(string, string->Length);
-           string = ALIGN_NEXT_DWORD(string);
          }
+ 
+         if (string_table->Length == 0)
+           break;
        }
      }
  

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