Fix #463: Wrong target offset calculated when using bnd prefix

zyantific · Nov 26, 2023 · 4a64a63 · 4a64a63
1 parent 157bca8
commit 4a64a63
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/Encoder.c b/src/Encoder.c
@@ -4373,7 +4373,8 @@ ZYDIS_EXPORT ZyanStatus ZydisEncoderEncodeInstructionAbsolute(ZydisEncoderReques
                     }
                     if ((rel_info->accepts_branch_hints) &&
                         (request->prefixes & (ZYDIS_ATTRIB_HAS_BRANCH_NOT_TAKEN |
-                                              ZYDIS_ATTRIB_HAS_BRANCH_TAKEN)))
+                                              ZYDIS_ATTRIB_HAS_BRANCH_TAKEN |
+                                              ZYDIS_ATTRIB_HAS_BND)))
                     {
                         extra_length = 1;
                     }

diff --git a/tools/ZydisTestEncoderAbsolute.c b/tools/ZydisTestEncoderAbsolute.c
@@ -224,6 +224,7 @@ static ZyanBool RunBranchingTests(void)
     static const ZydisInstructionAttributes prefixes[] = {
         0,
         ZYDIS_ATTRIB_HAS_BRANCH_TAKEN,
+        ZYDIS_ATTRIB_HAS_BND,
     };
     static const char *str_prefixes[] =
     {