mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-04-29 09:43:56 -07:00
cffa5703b9
etags had undefined behavior if input files, lines, tags, etc., had more than INT_MAX bytes. Clean up the usage of integer types to fix the overflow errors I found. * admin/merge-gnulib (GNULIB_MODULES): Add mempcpy. * lib-src/etags.c: Include inttypes.h, intprops.h. (memcpyz): New function. Use it to simplify several occurrences of memcpy followed by storing a trailing '\0'. (xnew): Use xnmalloc, to catch overflow on integer multiplication. (xrnew): Change last arg to multiplier. The type is not needed. All callers changed. (node, lineno, charno, linecharno, invalidcharno, make_tag): (pfnote, add_node, number_len, C_symtype, lbz, Makefile_targets) (readline): Use intmax_t for line numbers and character positions, instead of int or long. (linebuffer, make_tag, pfnote, total_size_of_entries, put_entry) (in_word_set, C_symtype, token, cstack, pushclass_above): (popclass_above, write_classname, consider_token, C_entries) (Ruby_functions, Makefile_targets, Lua_functions, TeX_commands) (TeX_decode_env, erlang_func, erlang_attribute, erlang_atom) (substitute, regex_tag_multiline, nocase_tail, readline_interval) (readline, savenstr, concat, etags_getcwd, relative_filename) (linebuffer_setlen): Use ptrdiff_t for object sizes, instead of int or long or unsigned or size_t. (write_classname, C_entries): Avoid sprintf, as the result could exceed INT_MAX bytes and then behavior goes haywire. (main): Use int, instead of unsigned, for argv counts. (get_language_from_filename): Use bool for boolean. (Ruby_functions): Prefer strcpy to memcpy when copying "=". (linebuffer_setlen): Use ‘if’ instead of ‘while’. (memory_full, xnmalloc, xnrealloc): New functions. (xmalloc): Use memory_full, and take a ptrdiff_t instead of a size_t. (xrealloc): Remove; no longer needed. * lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate. * lib/mempcpy.c, m4/mempcpy.m4: New files, copied from Gnulib.
121 lines
3.8 KiB
Bash
Executable file
121 lines
3.8 KiB
Bash
Executable file
#! /bin/sh
|
|
# Merge gnulib sources into Emacs sources.
|
|
# Typical usage:
|
|
#
|
|
# admin/merge-gnulib
|
|
|
|
# Copyright 2012-2019 Free Software Foundation, Inc.
|
|
|
|
# This file is part of GNU Emacs.
|
|
|
|
# GNU Emacs is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
|
|
# GNU Emacs 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 General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
# written by Paul Eggert
|
|
|
|
GNULIB_URL=git://git.savannah.gnu.org/gnulib.git
|
|
|
|
GNULIB_MODULES='
|
|
alloca-opt binary-io byteswap c-ctype c-strcase
|
|
canonicalize-lgpl
|
|
careadlinkat close-stream copy-file-range
|
|
count-leading-zeros count-one-bits count-trailing-zeros
|
|
crypto/md5-buffer crypto/sha1-buffer crypto/sha256-buffer crypto/sha512-buffer
|
|
d-type diffseq dosname double-slash-root dtoastr dtotimespec dup2
|
|
environ execinfo explicit_bzero faccessat
|
|
fcntl fcntl-h fdopendir
|
|
filemode filevercmp flexmember fpieee fstatat fsusage fsync
|
|
getloadavg getopt-gnu gettime gettimeofday gitlog-to-changelog
|
|
ieee754-h ignore-value intprops largefile lstat
|
|
manywarnings memmem-simple mempcpy memrchr minmax mkostemp mktime nstrftime
|
|
pathmax pipe2 pselect pthread_sigmask putenv
|
|
qcopy-acl readlink readlinkat regex
|
|
sig2str socklen stat-time std-gnu11 stdalign stddef stdio
|
|
stpcpy strnlen strtoimax symlink sys_stat sys_time
|
|
tempname time time_r time_rz timegm timer-time timespec-add timespec-sub
|
|
update-copyright unlocked-io utimens
|
|
vla warnings
|
|
'
|
|
|
|
AVOIDED_MODULES='
|
|
btowc close dup fchdir fstat langinfo lock
|
|
malloc-posix mbrtowc mbsinit memchr mkdir msvc-inval msvc-nothrow nl_langinfo
|
|
openat-die opendir raise
|
|
save-cwd select setenv sigprocmask stat stdarg stdbool
|
|
threadlib tzset unsetenv utime utime-h
|
|
wchar wcrtomb wctype-h
|
|
'
|
|
|
|
GNULIB_TOOL_FLAGS='
|
|
--conditional-dependencies --import --no-changelog --no-vc-files
|
|
--gnu-make
|
|
--makefile-name=gnulib.mk.in
|
|
'
|
|
|
|
# The source directory, with a trailing '/'.
|
|
# If empty, the source directory is the working directory.
|
|
src=$2
|
|
case $src in
|
|
*/ | '') ;;
|
|
*) src=$src/ ;;
|
|
esac
|
|
|
|
# Gnulib's source directory.
|
|
gnulib_srcdir=${1-$src../gnulib}
|
|
|
|
case $gnulib_srcdir in
|
|
-*) src=- ;;
|
|
esac
|
|
case $src in
|
|
-*)
|
|
printf '%s\n' >&2 "$0: usage: $0 [GNULIB_SRCDIR [SRCDIR]]
|
|
|
|
SRCDIR is the Emacs source directory (default: working directory).
|
|
GNULIB_SRCDIR is the Gnulib source directory (default: SRCDIR/../gnulib)."
|
|
exit 1 ;;
|
|
esac
|
|
|
|
test -x "$src"autogen.sh || {
|
|
printf '%s\n' >&2 "$0: '${src:-.}' is not an Emacs source directory."
|
|
exit 1
|
|
}
|
|
|
|
test -d "$gnulib_srcdir" ||
|
|
git clone -- "$GNULIB_URL" "$gnulib_srcdir" ||
|
|
exit
|
|
|
|
test -x "$gnulib_srcdir"/gnulib-tool || {
|
|
printf '%s\n' >&2 "$0: '$gnulib_srcdir' is not a Gnulib source directory."
|
|
exit 1
|
|
}
|
|
|
|
avoided_flags=
|
|
for module in $AVOIDED_MODULES; do
|
|
avoided_flags="$avoided_flags --avoid=$module"
|
|
done
|
|
|
|
"$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS \
|
|
$avoided_flags $GNULIB_MODULES &&
|
|
rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 \
|
|
"$src"m4/gl-openssl.m4 \
|
|
"$src"m4/gnulib-cache.m4 "$src"m4/gnulib-tool.m4 \
|
|
"$src"m4/manywarnings-c++.m4 \
|
|
"$src"m4/warn-on-use.m4 "$src"m4/wint_t.m4 &&
|
|
cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc &&
|
|
cp -- "$gnulib_srcdir"/build-aux/config.guess \
|
|
"$gnulib_srcdir"/build-aux/config.sub \
|
|
"$gnulib_srcdir"/build-aux/install-sh \
|
|
"$gnulib_srcdir"/build-aux/move-if-change \
|
|
"$src"build-aux &&
|
|
{ test -z "$src" || cd "$src"; } &&
|
|
./autogen.sh
|