Merge pull request #1907 from StalkR/ubsan

qemu: fix UBSAN errors in tcg and arm translation
unicorn-engine · Nov 14, 2023 · c0adcfb · c0adcfb
2 parents 6db5d1a + db63f2d
commit c0adcfb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/qemu/include/tcg/tcg-op.h b/qemu/include/tcg/tcg-op.h
@@ -46,8 +46,9 @@ static inline void gen_uc_tracecode(TCGContext *tcg_ctx, int32_t size, int32_t t
         0
     };
 
-    if (puc->hooks_count[type] == 1) {
-        cur = puc->hook[type].head;
+    const int hook_type = type & UC_HOOK_IDX_MASK;
+    if (puc->hooks_count[hook_type] == 1) {
+        cur = puc->hook[hook_type].head;
 
         while (cur) {
             hk = cur->data;

diff --git a/qemu/target/arm/translate.c b/qemu/target/arm/translate.c
@@ -7761,7 +7761,7 @@ static int t32_expandimm_rot(DisasContext *s, int x)
 /* Return the unrotated immediate from T32ExpandImm.  */
 static int t32_expandimm_imm(DisasContext *s, int x)
 {
-    int imm = extract32(x, 0, 8);
+    uint32_t imm = extract32(x, 0, 8);
 
     switch (extract32(x, 8, 4)) {
     case 0: /* XY */