Merge Limvot's error check.

2015-04-14 16:50:51 -04:00
parent d9b91fc58f 6d9be0c804
commit 0646f7a2f3
1 changed files with 4 additions and 1 deletions
--- a/src/obj.cpp
+++ b/src/obj.cpp
@@ -331,7 +331,10 @@ Obj *AsmReader::read(std::istream &input) {
        break;
      case ASM_T_INST:
        if (state == ST_INIT) {
-          Instruction::Opcode opc = opMap[yylval.s];
+          map<string, Instruction::Opcode>::iterator opcIterator = opMap.find(yylval.s);
+          if (opcIterator == opMap.end())
+            asmReaderError(yyline, "Invalid Instruction");
+          Instruction::Opcode opc = opcIterator->second;
          if (outstate != OS_TEXTCHUNK) {
            tc = new TextChunk(next_chunk_name, next_chunk_align,
                               flagsToWord(permR, permW, permX));