Revert "[PATCH] plug memory leak in diff.c::diff_free_filepair()"

Junio C Hamano · Junio C Hamano · commit 19397b4521bc · 2005-09-14T14:06:50.000-07:00
This reverts 068eac9 commit.
diff --git 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,
@@ -767,8 +768,8 @@ struct diff_filepair *diff_queue(struct diff_queue_struct *queue,
 
 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);
 }
 
diff --git a/diffcore-break.c b/diffcore-break.c
@@ -231,8 +231,8 @@ static void merge_broken(struct diff_filepair *p,
 
 	dp = diff_queue(outq, d->one, c->two);
 	dp->score = p->score;
-	diff_free_filespec(d->two);
-	diff_free_filespec(c->one);
+	diff_free_filespec_data(d->two);
+	diff_free_filespec_data(c->one);
 	free(d);
 	free(c);
 }
diff --git a/diffcore.h b/diffcore.h
@@ -43,7 +43,7 @@ extern void fill_filespec(struct diff_filespec *, const unsigned char *,
 			  unsigned short);
 
 extern int diff_populate_filespec(struct diff_filespec *, int);
-extern void diff_free_filespec(struct diff_filespec *);
+extern void diff_free_filespec_data(struct diff_filespec *);
 
 struct diff_filepair {
 	struct diff_filespec *one;

Original file line number	Diff line number	Diff line change
`@@ -402,13 +402,14 @@ int diff_populate_filespec(struct diff_filespec *s, int size_only)`
`402`	`402`	`return 0;`
`403`	`403`	`}`
`404`	`404`
`405`		`-void diff_free_filespec(struct diff_filespec *s)`
	`405`	`+void diff_free_filespec_data(struct diff_filespec *s)`
`406`	`406`	`{`
`407`	`407`	`if (s->should_free)`
`408`	`408`	`free(s->data);`
`409`	`409`	`else if (s->should_munmap)`
`410`	`410`	`munmap(s->data, s->size);`
`411`		`- free(s);`
	`411`	`+ s->should_free = s->should_munmap = 0;`
	`412`	`+ s->data = NULL;`
`412`	`413`	`}`
`413`	`414`
`414`	`415`	`static void prep_temp_blob(struct diff_tempfile *temp,`
`@@ -767,8 +768,8 @@ struct diff_filepair diff_queue(struct diff_queue_struct queue,`
`767`	`768`
`768`	`769`	`void diff_free_filepair(struct diff_filepair *p)`
`769`	`770`	`{`
`770`		`- diff_free_filespec(p->one);`
`771`		`- diff_free_filespec(p->two);`
	`771`	`+ diff_free_filespec_data(p->one);`
	`772`	`+ diff_free_filespec_data(p->two);`
`772`	`773`	`free(p);`
`773`	`774`	`}`
`774`	`775`