7b43dd9
--- dyninst-10.1.0/testsuite-10.1.0/src/instruction/test_instruction_farcall.C
7b43dd9
+++ dyninst-10.1.0/testsuite-10.1.0/src/instruction/test_instruction_farcall.C
7b43dd9
@@ -96,21 +96,21 @@ test_results_t test_instruction_farcall_Mutator::executeTest()
7b43dd9
   if(decodedInsns.size() != expectedInsns) // six valid, one invalid
7b43dd9
   {
7b43dd9
     logerror("FAILED: Expected %d instructions, decoded %d\n", expectedInsns, decodedInsns.size());
7b43dd9
-    for(std::vector<Instruction::Ptr>::iterator curInsn = decodedInsns.begin();
7b43dd9
+    for(std::vector<Instruction>::iterator curInsn = decodedInsns.begin();
7b43dd9
 	curInsn != decodedInsns.end();
7b43dd9
 	++curInsn)
7b43dd9
     {
7b43dd9
-      logerror("\t%s\t", (*curInsn)->format().c_str());
7b43dd9
-      for(unsigned j = 0; j < (*curInsn)->size(); ++j)
7b43dd9
+      logerror("\t%s\t", (*curInsn).format().c_str());
7b43dd9
+      for(unsigned j = 0; j < (*curInsn).size(); ++j)
7b43dd9
       {
7b43dd9
-	logerror("%x ", (*curInsn)->rawByte(j));
7b43dd9
+	logerror("%x ", (*curInsn).rawByte(j));
7b43dd9
       }
7b43dd9
       logerror("\n");
7b43dd9
     }
7b43dd9
     
7b43dd9
     return FAILED;
7b43dd9
   }
7b43dd9
-  if(decodedInsns.back() && decodedInsns.back()->isValid())
7b43dd9
+  if(decodedInsns.size() > 0 && decodedInsns.back().isValid())
7b43dd9
   {
7b43dd9
     logerror("FAILED: Expected instructions to end with an invalid instruction, but they didn't");
7b43dd9
     return FAILED;