[PATCH] Improve git-update-index error reporting

diff --git a/diff.c b/diff.c
index 1059049fb99ae45fcfb81f3bf9ebb19005c67561..d8d20c2fcb141124bf4c798eb054e5c1be451f68 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -402,13 +402,14 @@ int diff_populate_filespec(struct diff_filespec *s, int size_only)
        return 0;
 }
 
-void diff_free_filespec(struct diff_filespec *s)
+void diff_free_filespec_data(struct diff_filespec *s)
 {
        if (s->should_free)
                free(s->data);
        else if (s->should_munmap)
                munmap(s->data, s->size);
-       free(s);
+       s->should_free = s->should_munmap = 0;
+       s->data = NULL;
 }
 
 static void prep_temp_blob(struct diff_tempfile *temp,
@@ -761,14 +762,17 @@ struct diff_filepair *diff_queue(struct diff_queue_struct *queue,
        dp->status = 0;
        dp->source_stays = 0;
        dp->broken_pair = 0;
-       diff_q(queue, dp);
+       if (queue)
+               diff_q(queue, dp);
        return dp;
 }
 
 void diff_free_filepair(struct diff_filepair *p)
 {
-       diff_free_filespec(p->one);
-       diff_free_filespec(p->two);
+       diff_free_filespec_data(p->one);
+       diff_free_filespec_data(p->two);
+       free(p->one);
+       free(p->two);
        free(p);
 }