From: Sean Callanan Date: Sat, 9 Apr 2011 00:21:04 +0000 (+0000) Subject: Moved an access to an object past a NULL check, X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=052aa2c256acebab662b6099b155057d4092c3cf;p=oota-llvm.git Moved an access to an object past a NULL check, making the MC disassembler tester more robust. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@129175 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/tools/llvm-mc/Disassembler.cpp b/tools/llvm-mc/Disassembler.cpp index 41b92a1b302..cdd1892f25c 100644 --- a/tools/llvm-mc/Disassembler.cpp +++ b/tools/llvm-mc/Disassembler.cpp @@ -240,12 +240,12 @@ int Disassembler::disassembleEnhanced(const std::string &TS, OwningPtr 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) {