Mercurial > hg-stable
view mercurial/thirdparty/xdiff/xdiffi.h @ 36830:882657a9f768
xdiff: replace {unsigned ,}long with {u,}int64_t
MSVC treats "long" as 4-byte. That could cause overflows since the xdiff
code uses "long" in places where "size_t" or "ssize_t" should be used.
Let's use explicit 8 byte integers to avoid
FWIW git avoids that overflow by limiting diff size to 1GB [1]. After
examining the code, I think the remaining risk (the use of "int") is low
since "int" is only used for return values and hash table size. Although a
wrong hash table size would not affect the correctness of the code, but that
could make the code extremely slow. The next patch will change hash table
size to 8-byte integer so the 1GB limit is unlikely needed.
This patch was done by using `sed`.
[1]: https://github.com/git/git/commit/dcd1742e56ebb944c4ff62346da4548e1e3be67
Differential Revision: https://phab.mercurial-scm.org/D2762
author | Jun Wu <quark@fb.com> |
---|---|
date | Fri, 09 Mar 2018 14:24:27 -0800 |
parents | 90f8fe72446c |
children |
line wrap: on
line source
/* * LibXDiff by Davide Libenzi ( File Differential Library ) * Copyright (C) 2003 Davide Libenzi * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see * <http://www.gnu.org/licenses/>. * * Davide Libenzi <davidel@xmailserver.org> * */ #if !defined(XDIFFI_H) #define XDIFFI_H typedef struct s_diffdata { int64_t nrec; uint64_t const *ha; int64_t *rindex; char *rchg; } diffdata_t; typedef struct s_xdalgoenv { int64_t mxcost; int64_t snake_cnt; int64_t heur_min; } xdalgoenv_t; typedef struct s_xdchange { struct s_xdchange *next; int64_t i1, i2; int64_t chg1, chg2; int ignore; } xdchange_t; int xdl_recs_cmp(diffdata_t *dd1, int64_t off1, int64_t lim1, diffdata_t *dd2, int64_t off2, int64_t lim2, int64_t *kvdf, int64_t *kvdb, int need_min, xdalgoenv_t *xenv); int xdl_do_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdfenv_t *xe); int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, int64_t flags); int xdl_build_script(xdfenv_t *xe, xdchange_t **xscr); void xdl_free_script(xdchange_t *xscr); #endif /* #if !defined(XDIFFI_H) */