[Forensics-changes] [yara] 252/415: Fix issue 74

[Hilko Bengen]

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

bengen pushed a commit to branch debian
in repository yara.

commit 08913dbfb9a62c08c0596ad2a1661006b135ae0d
Author: Victor M. Alvarez <plusvic at gmail.com>
Date:   Mon Nov 25 17:35:22 2013 +0100

    Fix issue 74
---
 yara.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/yara.c b/yara.c
index 2894ab9..f392117 100644
--- a/yara.c
+++ b/yara.c
@@ -201,7 +201,7 @@ void scan_dir(const char* dir, int recursive, YARA_CONTEXT* context, YARACALLBAC
 
 #endif
 
-void print_string(unsigned char* data, unsigned int length, int unicode)
+void print_string(unsigned char* data, unsigned int length)
 {
     unsigned int i;
     char* str;
@@ -218,8 +218,6 @@ void print_string(unsigned char* data, unsigned int length, int unicode)
         {
             printf("\\x%02x", str[i]);
         }
-
-        if (unicode) i++;
     }
 
     printf("\n");
@@ -368,13 +366,9 @@ int callback(RULE* rule, void* data)
                         {
                             print_hex_string(match->data, match->length);
                         }
-                        else if (IS_WIDE(string))
-                        {
-                            print_string(match->data, match->length, TRUE);
-                        }
                         else
                         {
-                            print_string(match->data, match->length, FALSE);
+                            print_string(match->data, match->length);
                         }
 
                         match = match->next;

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