projects
/
git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'jk/no-diff-emit-common'
[git]
/
xdiff-interface.c
diff --git
a/xdiff-interface.c
b/xdiff-interface.c
index
ecfa05f
..
cb67c1c
100644
(file)
--- a/
xdiff-interface.c
+++ b/
xdiff-interface.c
@@
-131,6
+131,9
@@
int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t co
mmfile_t a = *mf1;
mmfile_t b = *mf2;
+ if (mf1->size > MAX_XDIFF_SIZE || mf2->size > MAX_XDIFF_SIZE)
+ return -1;
+
trim_common_tail(&a, &b, xecfg->ctxlen);
return xdl_diff(&a, &b, xpp, xecfg, xecb);