short circuit out of a few places where we would allocate zero bytes

Eric Wong · Junio C Hamano · commit 7d6fb370bc98 · 2005-12-26T08:59:21.000-08:00
dietlibc versions of malloc, calloc and realloc all return NULL if
they're told to allocate 0 bytes, causes the x* wrappers to die().

There are several more places where these calls could end up asking
for 0 bytes, too...

Maybe simply not die()-ing in the x* wrappers if 0/NULL is returned
when the requested size is zero is a safer and easier way to go.

Signed-off-by: Eric Wong &lt;normalperson@yhbt.net&gt;
Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git a/commit.c b/commit.c
@@ -560,6 +560,9 @@ void sort_in_topological_order(struct commit_list ** list)
 		next = next->next;
 		count++;
 	}
+	
+	if (!count)
+		return;
 	/* allocate an array to help sort the list */
 	nodes = xcalloc(count, sizeof(*nodes));
 	/* link the list to the array */
diff --git a/diffcore-rename.c b/diffcore-rename.c
@@ -282,7 +282,7 @@ void diffcore_rename(struct diff_options *options)
 		else if (detect_rename == DIFF_DETECT_COPY)
 			register_rename_src(p->one, 1);
 	}
-	if (rename_dst_nr == 0 ||
+	if (rename_dst_nr == 0 || rename_src_nr == 0 ||
 	    (0 < rename_limit && rename_limit < rename_dst_nr))
 		goto cleanup; /* nothing to do */
 

Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ void diffcore_rename(struct diff_options *options)`
`282`	`282`	`else if (detect_rename == DIFF_DETECT_COPY)`
`283`	`283`	`register_rename_src(p->one, 1);`
`284`	`284`	`}`
`285`		`- if (rename_dst_nr == 0 \|\|`
	`285`	`+ if (rename_dst_nr == 0 \|\| rename_src_nr == 0 \|\|`
`286`	`286`	`(0 < rename_limit && rename_limit < rename_dst_nr))`
`287`	`287`	`goto cleanup; /* nothing to do */`
`288`	`288`