commit 40d45a7bb3bd07d50562a468f9c550f555eb2f8a
author Jan Niklas Hasse <jhasse@bixense.com> Wed Oct 30 15:43:49 2019 +0100
committer GitHub <noreply@github.com> Wed Oct 30 15:43:49 2019 +0100
tree 322fc5928c55e35975dc517cb27d544921feef0b
parent 97c5949ffeb4ec84cec1290c118cf34aa0e503e4
parent 04ce2ea7a2930b32655823d55a8ff9865a37d6c2

Merge pull request #1654 from BourgondAries/master

Ensure substring indexing never goes negative

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index cffa8b3..e5d7d2b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,8 +19,6 @@
       dist: xenial
       compiler: clang
     - os: osx
-      osx_image: xcode9.4
-    - os: osx
       osx_image: xcode10
     - os: osx
       osx_image: xcode10.1

src/build_log.cc

diff --git a/src/build_log.cc b/src/build_log.cc
index 774f72f..c4a08a0 100644
--- a/src/build_log.cc
+++ b/src/build_log.cc
@@ -49,7 +49,6 @@
 namespace {
 
 const char kFileSignature[] = "# ninja log v%d\n";
-const char kFileColumnLabels[] = "# start_time end_time mtime command hash\n";
 const int kOldestSupportedVersion = 4;
 const int kCurrentVersion = 5;
 
@@ -145,8 +144,7 @@
   fseek(log_file_, 0, SEEK_END);
 
   if (ftell(log_file_) == 0) {
-    if (fprintf(log_file_, kFileSignature, kCurrentVersion) < 0 ||
-        fprintf(log_file_, kFileColumnLabels) < 0) {
+    if (fprintf(log_file_, kFileSignature, kCurrentVersion) < 0) {
       *err = strerror(errno);
       return false;
     }

src/build_log_test.cc

diff --git a/src/build_log_test.cc b/src/build_log_test.cc
index eea818f..ad30380 100644
--- a/src/build_log_test.cc
+++ b/src/build_log_test.cc
@@ -70,9 +70,8 @@
 }
 
 TEST_F(BuildLogTest, FirstWriteAddsSignature) {
-  const char kExpectedContent[] = "# ninja log vX\n"
-                                  "# start_time end_time mtime command hash\n";
-  const size_t kVersionPos = 13;  // Points at 'X'.
+  const char kExpectedVersion[] = "# ninja log vX\n";
+  const size_t kVersionPos = strlen(kExpectedVersion) - 2;  // Points at 'X'.
 
   BuildLog log;
   string contents, err;
@@ -85,7 +84,7 @@
   ASSERT_EQ("", err);
   if (contents.size() >= kVersionPos)
     contents[kVersionPos] = 'X';
-  EXPECT_EQ(kExpectedContent, contents);
+  EXPECT_EQ(kExpectedVersion, contents);
 
   // Opening the file anew shouldn't add a second version string.
   EXPECT_TRUE(log.OpenForWrite(kTestFilename, *this, &err));
@@ -97,7 +96,7 @@
   ASSERT_EQ("", err);
   if (contents.size() >= kVersionPos)
     contents[kVersionPos] = 'X';
-  EXPECT_EQ(kExpectedContent, contents);
+  EXPECT_EQ(kExpectedVersion, contents);
 }
 
 TEST_F(BuildLogTest, DoubleEntry) {