Treat RIZ/EIZ as an invalid register in hasIndexRegister

irdb-libs/libIRDB-core/src/operand_csx86.cpp

@@ -464,9 +464,14 @@ bool DecodedOperandCapstoneX86_t::hasBaseRegister() const
 
 bool DecodedOperandCapstoneX86_t::hasIndexRegister() const
 {
-        const auto the_insn=static_cast<cs_insn*>(my_insn.get());
-        const auto &op = (the_insn->detail->x86.operands[op_num]);
-	return isMemory() && op.mem.index!=X86_REG_INVALID;
+    const auto the_insn=static_cast<cs_insn*>(my_insn.get());
+    const auto &op = (the_insn->detail->x86.operands[op_num]);
+
+    const auto index_reg_is_valid =
+        op.mem.index != X86_REG_INVALID &&
+        op.mem.index != X86_REG_EIZ &&
+        op.mem.index != X86_REG_RIZ;
+    return isMemory() && index_reg_is_valid;
 }
 
 uint32_t DecodedOperandCapstoneX86_t::getBaseRegister() const