Mercurial > hg
view mercurial/thirdparty/xdiff/xutils.h @ 36822: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 | 49fe6249937a |
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(XUTILS_H) #define XUTILS_H int64_t xdl_bogosqrt(int64_t n); int xdl_cha_init(chastore_t *cha, int64_t isize, int64_t icount); void xdl_cha_free(chastore_t *cha); void *xdl_cha_alloc(chastore_t *cha); int64_t xdl_guess_lines(mmfile_t *mf, int64_t sample); int xdl_recmatch(const char *l1, int64_t s1, const char *l2, int64_t s2, int64_t flags); uint64_t xdl_hash_record(char const **data, char const *top, int64_t flags); unsigned int xdl_hashbits(unsigned int size); #endif /* #if !defined(XUTILS_H) */