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

src/log-utils.cc

Index: src/log-utils.cc
===================================================================
--- src/log-utils.cc	(revision 4205)
+++ src/log-utils.cc	(working copy)
@@ -196,6 +196,9 @@
   char* end_pos = dest_buf + actual_size - 1;
   while (end_pos >= dest_buf && *end_pos != '\n') --end_pos;
   actual_size = static_cast<int>(end_pos - dest_buf + 1);
+  // If the assertion below is hit, it means that there was no line end
+  // found --- something wrong has happened.
+  ASSERT(actual_size > 0);
   ASSERT(actual_size <= max_size);
   return actual_size;
 }