diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-09-28 22:33:56 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-09-28 22:33:56 (GMT) |
commit | 11a458befcd7662fbe6d2d53c76d49ae2b0fe219 (patch) | |
tree | de4cf6a8a43cb30b53f924ed8820de09409f0afd /xdiff-interface.c | |
parent | ee6ad5f4d56e697c972af86cbefdf269b386e470 (diff) | |
parent | a2558fb8e1e387b630312311e1d22c95663da5d0 (diff) | |
download | git-11a458befcd7662fbe6d2d53c76d49ae2b0fe219.zip git-11a458befcd7662fbe6d2d53c76d49ae2b0fe219.tar.gz git-11a458befcd7662fbe6d2d53c76d49ae2b0fe219.tar.bz2 |
Sync with 2.4.10
Diffstat (limited to 'xdiff-interface.c')
-rw-r--r-- | xdiff-interface.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/xdiff-interface.c b/xdiff-interface.c index ecfa05f..cb67c1c 100644 --- 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); |