From e59f8ca49e0d2c2e2d9761b1dd15eaf59a6e5558 Mon Sep 17 00:00:00 2001
From: Shantonu Sen <ssen@apple.com>
Date: Tue, 5 Apr 2011 18:40:45 +0000
Subject: An MCDisassembler has the option to not implement getEDInfo(), in
 which case this code would dereference NULL. EDInst can already handle NULL
 info, so avoid the dereference and pass NULL through.

Reviewed by Sean Callanan

llvm-svn: 128904
---
 llvm/lib/MC/MCDisassembler/EDDisassembler.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'llvm/lib/MC/MCDisassembler/EDDisassembler.cpp')

diff --git a/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp b/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp
index f679647..e36b3a4e 100644
--- a/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp
+++ b/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp
@@ -254,9 +254,11 @@ EDInst *EDDisassembler::createInst(EDByteReaderCallback byteReader,
     delete inst;
     return NULL;
   } else {
-    const llvm::EDInstInfo *thisInstInfo;
+    const llvm::EDInstInfo *thisInstInfo = NULL;
 
-    thisInstInfo = &InstInfos[inst->getOpcode()];
+    if (InstInfos) {
+      thisInstInfo = &InstInfos[inst->getOpcode()];
+    }
     
     EDInst* sdInst = new EDInst(inst, byteSize, *this, thisInstInfo);
     return sdInst;
-- 
cgit v1.1