projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix error handling for nonexistent names
[git.git]
/
diffcore-order.c
diff --git
a/diffcore-order.c
b/diffcore-order.c
index
a03862c
..
0bc2b22
100644
(file)
--- a/
diffcore-order.c
+++ b/
diffcore-order.c
@@
-28,7
+28,7
@@
static void prepare_order(const char *orderfile)
}
map = mmap(NULL, st.st_size, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0);
close(fd);
}
map = mmap(NULL, st.st_size, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0);
close(fd);
- if (
-1 == (int)(long)map
)
+ if (
map == MAP_FAILED
)
return;
endp = map + st.st_size;
for (pass = 0; pass < 2; pass++) {
return;
endp = map + st.st_size;
for (pass = 0; pass < 2; pass++) {
@@
-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;
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;
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];
prepare_order(orderfile);
for (i = 0; i < q->nr; i++) {
o[i].pair = q->queue[i];