Fix EVEN number of bugs in already passing test

test/cctest/test-debug.cc

 // Copyright 2007-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 2179 matching lines @@
   for (int i = 0; i < length; ++i) {
     output_buffer[i] = static_cast<char>(input_buffer[i]);
   }
   output_buffer[length] = '\0';
   return length;
 }
 
 
 // We match parts of the message to get evaluate result int value.
 bool GetEvaluateStringResult(char *message, char* buffer, int buffer_size) {
-  const char* value = "\"value\":";
-  char* pos = strstr(message, value);
-  if (pos == NULL) {
+  if (strstr(message, "\"command\":\"evaluate\"") == NULL) {
+    return false;
+  }
+  const char* prefix = "\"text\":\"";
+  char* pos1 = strstr(message, prefix);
+  if (pos1 == NULL) {
+    return false;
+  }
+  pos1 += strlen(prefix);
+  char* pos2 = strchr(pos1, '"');
+  if (pos2 == NULL) {
     return false;
   }
   Vector<char> buf(buffer, buffer_size);
-  OS::StrNCpy(buf, pos, buffer_size - 1);
+  int len = pos2 - pos1;
+  if (len > buffer_size - 1) {
+    len = buffer_size - 1;
+  }
+  OS::StrNCpy(buf, pos1, len);
   buffer[buffer_size - 1] = '\0';
   return true;
 }
 
 
 struct EvaluateResult {
   static const int kBufferSize = 20;
   char buffer[kBufferSize];
 };
 
@@ skipping 79 matching lines @@
      "    \"global\":true,"
      "    \"expression\":\"239 + 566\",\"disable_break\":true"
      "}}";
 
   v8::Debug::SendCommand(buffer, AsciiToUtf16(command_113, buffer));
 
   v8::Debug::ProcessDebugMessages();
 
   CHECK_EQ(3, process_debug_messages_data.counter);
 
-  CHECK(strcmp("Pinguin", process_debug_messages_data.results[0].buffer));
-  CHECK(strcmp("Captbara", process_debug_messages_data.results[1].buffer));
-  CHECK(strcmp("805", process_debug_messages_data.results[2].buffer));
+  CHECK(strcmp("Pinguin", process_debug_messages_data.results[0].buffer) == 0);
+  CHECK(strcmp("Capybara", process_debug_messages_data.results[1].buffer) == 0);
+  CHECK(strcmp("805", process_debug_messages_data.results[2].buffer) == 0);
 
   v8::Debug::SetMessageHandler(NULL);
   v8::Debug::SetDebugEventListener(NULL);
   CheckDebuggerUnloaded();
 }
 
 
 // Simple test of the stepping mechanism using only store ICs.
 TEST(DebugStepLinear) {
   v8::HandleScope scope;
@@ skipping 3701 matching lines @@
 
   break_point_hit_count = 0;
   foo->Call(env->Global(), 0, NULL);
   CHECK_EQ(1, break_point_hit_count);
 
   v8::Debug::SetDebugEventListener(NULL);
   debugee_context = v8::Handle<v8::Context>();
   debugger_context = v8::Handle<v8::Context>();
   CheckDebuggerUnloaded();
 }