Merge pull request #908 from nodegit/fix-segfault-convenient-patch

implausible · implausible · commit 42df674a0c55 · 2016-02-18T10:27:57.000-07:00
Don't check for \\ No newline at end of file\n if it can't exist
diff --git a/generate/templates/manual/src/convenient_patch.cc b/generate/templates/manual/src/convenient_patch.cc
@@ -75,13 +75,17 @@ PatchData *createFromRaw(git_patch *raw) {
       const git_diff_line *line;
       git_patch_get_line_in_hunk(&line, raw, i, j);
 
-      if (
-        j == 0 &&
-        !strcmp(
-          &line->content[strlen(line->content) - 29],
-          "\n\\ No newline at end of file\n"
-      )) {
-        EOFFlag = true;
+      if (j == 0) {
+        // calculate strlen only once for the first line of the first hunk.
+        int calculatedContentLength = strlen(line->content);
+        if (
+          calculatedContentLength > 29 &&
+          !strcmp(
+              &line->content[calculatedContentLength - 29],
+              "\n\\ No newline at end of file\n"
+        )) {
+          EOFFlag = true;
+        }
       }
 
       storeLine->origin = line->origin;
