Fix issue in logic expression.

plusvic · plusvic · commit 7edc12b22d30 · 2020-05-15T09:53:53.000+02:00
Both operands in a logic OR expression where the same.
diff --git a/libyara/scan.c b/libyara/scan.c
@@ -722,7 +722,8 @@ static int _yr_scan_verify_re_match(
 
   if ((forward_matches == -1) &&
       (STRING_IS_WIDE(ac_match->string) &&
-      !(STRING_IS_BASE64_WIDE(ac_match->string) || STRING_IS_BASE64_WIDE(ac_match->string))))
+      !(STRING_IS_BASE64(ac_match->string) ||
+        STRING_IS_BASE64_WIDE(ac_match->string))))
   {
     flags |= RE_FLAGS_WIDE;
     FAIL_ON_ERROR(exec(

Original file line number	Diff line number	Diff line change
`@@ -722,7 +722,8 @@ static int _yr_scan_verify_re_match(`
`722`	`722`
`723`	`723`	`if ((forward_matches == -1) &&`
`724`	`724`	`(STRING_IS_WIDE(ac_match->string) &&`
`725`		`- !(STRING_IS_BASE64_WIDE(ac_match->string) \|\| STRING_IS_BASE64_WIDE(ac_match->string))))`
	`725`	`+ !(STRING_IS_BASE64(ac_match->string) \|\|`
	`726`	`+ STRING_IS_BASE64_WIDE(ac_match->string))))`
`726`	`727`	`{`
`727`	`728`	`flags \|= RE_FLAGS_WIDE;`
`728`	`729`	`FAIL_ON_ERROR(exec(`