Merge bleeding_edge from version 2.1.3 up to revision 4205...

src/api.cc

Index: src/api.cc
===================================================================
--- src/api.cc	(revision 4205)
+++ src/api.cc	(working copy)
@@ -3586,6 +3586,7 @@
 
 int V8::GetLogLines(int from_pos, char* dest_buf, int max_size) {
 #ifdef ENABLE_LOGGING_AND_PROFILING
+  ASSERT(max_size >= kMinimumSizeForLogLinesBuffer);
   return i::Logger::GetLogLines(from_pos, dest_buf, max_size);
 #endif
   return 0;