X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diffcore-order.c;h=0bc2b22f848457a8e6ffafc6a1d9a26be677209f;hb=74237d6236d7e32f69469ff26df3f3bb3875f523;hp=b38122361f837e2e2577a89ae7aec311730b7f10;hpb=80bd6f3064a6009cd18a4dab9ce6d29681cec4af;p=git.git

diff --git a/diffcore-order.c b/diffcore-order.c
index b3812236..0bc2b22f 100644
--- a/diffcore-order.c
+++ b/diffcore-order.c
@@ -105,9 +105,13 @@ static int compare_pair_order(const void *a_, const void *b_)
 void diffcore_order(const char *orderfile)
 {
 	struct diff_queue_struct *q = &diff_queued_diff;
-	struct pair_order *o = xmalloc(sizeof(*o) * q->nr);
+	struct pair_order *o;
 	int i;
 
+	if (!q->nr)
+		return;
+
+	o = xmalloc(sizeof(*o) * q->nr);
 	prepare_order(orderfile);
 	for (i = 0; i < q->nr; i++) {
 		o[i].pair = q->queue[i];