From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 3 Mar 2017 15:50:29 +0000 (+0000)
Subject: disas/i386: Avoid NULL pointer dereference in error case
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3f168b5d353fa68baab55ea0c6ba791f0df027dc;p=qemu.git

disas/i386: Avoid NULL pointer dereference in error case

In a code path where we hit an internal disassembler error, execution
would subsequently attempt to dereference a NULL pointer.  This
should never happen, but avoid the crash.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1488556233-31246-3-git-send-email-peter.maydell@linaro.org
---

diff --git a/disas/i386.c b/disas/i386.c
index 07f871fd64..f1e376ca4a 100644
--- a/disas/i386.c
+++ b/disas/i386.c
@@ -4043,7 +4043,7 @@ print_insn (bfd_vma pc, disassemble_info *info)
 	    }
 	}
 
-      if (putop (dp->name, sizeflag) == 0)
+      if (dp->name != NULL && putop (dp->name, sizeflag) == 0)
         {
 	  for (i = 0; i < MAX_OPERANDS; ++i)
 	    {