Merge branch ak/svn

diff --git a/diff.c b/diff.c
index 562ca01218c6db870dd0b1b5c0a34ac1cbc1cb2a..5eae0947f35606eab6ff3421fe64fa5cb236f2ad 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -484,6 +484,8 @@ void diff_free_filespec_data(struct diff_filespec *s)
                munmap(s->data, s->size);
        s->should_free = s->should_munmap = 0;
        s->data = NULL;
+       free(s->cnt_data);
+       s->cnt_data = NULL;
 }
 
 static void prep_temp_blob(struct diff_tempfile *temp,