summaryrefslogtreecommitdiffstats
path: root/llvm/tools/llvm-mc/Disassembler.cpp
diff options
context:
space:
mode:
authorSean Callanan <scallanan@apple.com>2011-04-09 00:21:04 +0000
committerSean Callanan <scallanan@apple.com>2011-04-09 00:21:04 +0000
commit7ccf3756220db77c528ccaf3a4972a86dd0c387f (patch)
tree3ad58a8c93d2ca901fe5d746c32b782712d72e34 /llvm/tools/llvm-mc/Disassembler.cpp
parent7f36a79ee9387b738b83a265d6b30427de35b2df (diff)
downloadbcm5719-llvm-7ccf3756220db77c528ccaf3a4972a86dd0c387f.tar.gz
bcm5719-llvm-7ccf3756220db77c528ccaf3a4972a86dd0c387f.zip
Moved an access to an object past a NULL check,
making the MC disassembler tester more robust. llvm-svn: 129175
Diffstat (limited to 'llvm/tools/llvm-mc/Disassembler.cpp')
-rw-r--r--llvm/tools/llvm-mc/Disassembler.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/tools/llvm-mc/Disassembler.cpp b/llvm/tools/llvm-mc/Disassembler.cpp
index 41b92a1b302..cdd1892f25c 100644
--- a/llvm/tools/llvm-mc/Disassembler.cpp
+++ b/llvm/tools/llvm-mc/Disassembler.cpp
@@ -240,12 +240,12 @@ int Disassembler::disassembleEnhanced(const std::string &TS,
OwningPtr<EDInst>
inst(disassembler->createInst(byteArrayReader, 0, &ByteArray));
- ByteArray.erase (ByteArray.begin(), ByteArray.begin() + inst->byteSize());
-
if (inst == 0) {
errs() << "error: Didn't get an instruction\n";
return -1;
}
+
+ ByteArray.erase (ByteArray.begin(), ByteArray.begin() + inst->byteSize());
unsigned numTokens = inst->numTokens();
if ((int)numTokens < 0) {
OpenPOWER on IntegriCloud