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

ZehMatt · ZehMatt · commit 4a64a637bc89 · 2023-11-26T19:31:10.000+02:00
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[] =
     {

Original file line number	Diff line number	Diff line change
`@@ -4373,7 +4373,8 @@ ZYDIS_EXPORT ZyanStatus ZydisEncoderEncodeInstructionAbsolute(ZydisEncoderReques`
`4373`	`4373`	`}`
`4374`	`4374`	`if ((rel_info->accepts_branch_hints) &&`
`4375`	`4375`	`(request->prefixes & (ZYDIS_ATTRIB_HAS_BRANCH_NOT_TAKEN \|`
`4376`		`- ZYDIS_ATTRIB_HAS_BRANCH_TAKEN)))`
	`4376`	`+ ZYDIS_ATTRIB_HAS_BRANCH_TAKEN \|`
	`4377`	`+ ZYDIS_ATTRIB_HAS_BND)))`
`4377`	`4378`	`{`
`4378`	`4379`	`extra_length = 1;`
`4379`	`4380`	`}`
Original file line number	Diff line number	Diff line change
`@@ -224,6 +224,7 @@ static ZyanBool RunBranchingTests(void)`
`224`	`224`	`static const ZydisInstructionAttributes prefixes[] = {`
`225`	`225`	`0,`
`226`	`226`	`ZYDIS_ATTRIB_HAS_BRANCH_TAKEN,`
	`227`	`+ ZYDIS_ATTRIB_HAS_BND,`
`227`	`228`	`};`
`228`	`229`	`static const char *str_prefixes[] =`
`229`	`230`	`{`