From 1aa5e648f177b05e522ecce088bf400f78015f8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Ho=CC=88ner?= <athre0z@zyantific.com>
Date: Mon, 21 May 2018 16:00:06 +0200
Subject: [PATCH] Backported "Fixed a wrong assert condition" from future
 branch

Commit on future: e6dbba0bd314680dda64ef34e56cd12046ae8a2d
---
 src/Decoder.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Decoder.c b/src/Decoder.c
index 08fe326..293ea1c 100644
--- a/src/Decoder.c
+++ b/src/Decoder.c
@@ -1999,11 +1999,11 @@ FinalizeOperand:
     }
 
 #if !defined(ZYDIS_DISABLE_EVEX) || !defined(ZYDIS_DISABLE_MVEX)
-    // Fix operand-action for EVEX instructions with merge-mask
+    // Fix operand-action for EVEX/MVEX instructions with merge-mask
     if (instruction->avx.mask.reg && (instruction->avx.mask.mode == ZYDIS_MASK_MODE_MERGE) &&
         !instruction->avx.mask.isControlMask)
     {
-        ZYDIS_ASSERT(instruction->operandCount >= 2);
+        ZYDIS_ASSERT(instruction->operandCount >= 1);
         switch (instruction->operands[0].action)
         {
         case ZYDIS_OPERAND_ACTION_WRITE: