This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

v8: debug: fix error handling in SendConnectMessage()

The old error handling code checked if the return value of Socket::Send() != 0,
which is wrong because Socket::Send() can write less bytes than requested or
return -1 on error.
  • Loading branch information...
1 parent c08357c commit 26f754d9ddcdab02cbed4eab6c3f7a36907e8a13 @bnoordhuis bnoordhuis committed with isaacs Apr 24, 2012
Showing with 13 additions and 13 deletions.
  1. +13 −13 deps/v8/src/debug-agent.cc
View
@@ -323,41 +323,41 @@ bool DebuggerAgentUtil::SendConnectMessage(const Socket* conn,
const char* embedding_host) {
static const int kBufferSize = 80;
char buffer[kBufferSize]; // Sending buffer.
- bool ok;
int len;
+ int r;
// Send the header.
len = OS::SNPrintF(Vector<char>(buffer, kBufferSize),
"Type: connect\r\n");
- ok = conn->Send(buffer, len);
- if (!ok) return false;
+ r = conn->Send(buffer, len);
+ if (r != len) return false;
len = OS::SNPrintF(Vector<char>(buffer, kBufferSize),
"V8-Version: %s\r\n", v8::V8::GetVersion());
- ok = conn->Send(buffer, len);
- if (!ok) return false;
+ r = conn->Send(buffer, len);
+ if (r != len) return false;
len = OS::SNPrintF(Vector<char>(buffer, kBufferSize),
"Protocol-Version: 1\r\n");
- ok = conn->Send(buffer, len);
- if (!ok) return false;
+ r = conn->Send(buffer, len);
+ if (r != len) return false;
if (embedding_host != NULL) {
len = OS::SNPrintF(Vector<char>(buffer, kBufferSize),
"Embedding-Host: %s\r\n", embedding_host);
- ok = conn->Send(buffer, len);
- if (!ok) return false;
+ r = conn->Send(buffer, len);
+ if (r != len) return false;
}
len = OS::SNPrintF(Vector<char>(buffer, kBufferSize),
"%s: 0\r\n", kContentLength);
- ok = conn->Send(buffer, len);
- if (!ok) return false;
+ r = conn->Send(buffer, len);
+ if (r != len) return false;
// Terminate header with empty line.
len = OS::SNPrintF(Vector<char>(buffer, kBufferSize), "\r\n");
- ok = conn->Send(buffer, len);
- if (!ok) return false;
+ r = conn->Send(buffer, len);
+ if (r != len) return false;
// No body for connect message.

0 comments on commit 26f754d

Please sign in to comment.