mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
![Johannes Schindelin](/assets/img/avatar_default.png)
There seems to be some internal stack overflow detection in MSVC's `malloc()` machinery that seems to be independent of the `stack reserve` and `heap reserve` sizes specified in the executable (editable via `EDITBIN /STACK:<n> <exe>` and `EDITBIN /HEAP:<n> <exe>`). In the newly test cases added by `jk/tree-name-and-depth-limit`, this stack overflow detection is unfortunately triggered before Git can print out the error message about too-deep trees and exit gracefully. Instead, it exits with `STATUS_STACK_OVERFLOW`. This corresponds to the numeric value -1073741571, something the MSYS2 runtime we sadly need to use to run Git's test suite cannot handle and which it internally maps to the exit code 127. Git's test suite, in turn, mistakes this to mean that the command was not found, and fails both test cases. Here is an example stack trace from an example run: [0x0] ntdll!RtlpAllocateHeap+0x31 0x4212603f50 0x7ff9d6d4cd49 [0x1] ntdll!RtlpAllocateHeapInternal+0x6c9 0x42126041b0 0x7ff9d6e14512 [0x2] ntdll!RtlDebugAllocateHeap+0x102 0x42126042b0 0x7ff9d6dcd8b0 [0x3] ntdll!RtlpAllocateHeap+0x7ec70 0x4212604350 0x7ff9d6d4cd49 [0x4] ntdll!RtlpAllocateHeapInternal+0x6c9 0x42126045b0 0x7ff9596ed480 [0x5] ucrtbased!heap_alloc_dbg_internal+0x210 0x42126046b0 0x7ff9596ed20d [0x6] ucrtbased!heap_alloc_dbg+0x4d 0x4212604750 0x7ff9596f037f [0x7] ucrtbased!_malloc_dbg+0x2f 0x42126047a0 0x7ff9596f0dee [0x8] ucrtbased!malloc+0x1e 0x42126047d0 0x7ff730fcc1ef [0x9] git!do_xmalloc+0x2f 0x4212604800 0x7ff730fcc2b9 [0xa] git!do_xmallocz+0x59 0x4212604840 0x7ff730fca779 [0xb] git!xmallocz_gently+0x19 0x4212604880 0x7ff7311b0883 [0xc] git!unpack_compressed_entry+0x43 0x42126048b0 0x7ff7311ac9a4 [0xd] git!unpack_entry+0x554 0x42126049a0 0x7ff7311b0628 [0xe] git!cache_or_unpack_entry+0x58 0x4212605250 0x7ff7311ad3a8 [0xf] git!packed_object_info+0x98 0x42126052a0 0x7ff7310a92da [0x10] git!do_oid_object_info_extended+0x3fa 0x42126053b0 0x7ff7310a44e7 [0x11] git!oid_object_info_extended+0x37 0x4212605460 0x7ff7310a38ba [0x12] git!repo_read_object_file+0x9a 0x42126054a0 0x7ff7310a6147 [0x13] git!read_object_with_reference+0x97 0x4212605560 0x7ff7310b4656 [0x14] git!fill_tree_descriptor+0x66 0x4212605620 0x7ff7310dc0a5 [0x15] git!traverse_trees_recursive+0x3f5 0x4212605680 0x7ff7310dd831 [0x16] git!unpack_callback+0x441 0x4212605790 0x7ff7310b4c95 [0x17] git!traverse_trees+0x5d5 0x42126058a0 0x7ff7310dc0f2 [0x18] git!traverse_trees_recursive+0x442 0x4212605980 0x7ff7310dd831 [0x19] git!unpack_callback+0x441 0x4212605a90 0x7ff7310b4c95 [0x1a] git!traverse_trees+0x5d5 0x4212605ba0 0x7ff7310dc0f2 [0x1b] git!traverse_trees_recursive+0x442 0x4212605c80 0x7ff7310dd831 [0x1c] git!unpack_callback+0x441 0x4212605d90 0x7ff7310b4c95 [0x1d] git!traverse_trees+0x5d5 0x4212605ea0 0x7ff7310dc0f2 [0x1e] git!traverse_trees_recursive+0x442 0x4212605f80 0x7ff7310dd831 [0x1f] git!unpack_callback+0x441 0x4212606090 0x7ff7310b4c95 [0x20] git!traverse_trees+0x5d5 0x42126061a0 0x7ff7310dc0f2 [0x21] git!traverse_trees_recursive+0x442 0x4212606280 0x7ff7310dd831 [...] [0xfad] git!cmd_main+0x2a2 0x42126ff740 0x7ff730fb6345 [0xfae] git!main+0xe5 0x42126ff7c0 0x7ff730fbff93 [0xfaf] git!wmain+0x2a3 0x42126ff830 0x7ff731318859 [0xfb0] git!invoke_main+0x39 0x42126ff8a0 0x7ff7313186fe [0xfb1] git!__scrt_common_main_seh+0x12e 0x42126ff8f0 0x7ff7313185be [0xfb2] git!__scrt_common_main+0xe 0x42126ff960 0x7ff7313188ee [0xfb3] git!wmainCRTStartup+0xe 0x42126ff990 0x7ff9d5ed257d [0xfb4] KERNEL32!BaseThreadInitThunk+0x1d 0x42126ff9c0 0x7ff9d6d6aa78 [0xfb5] ntdll!RtlUserThreadStart+0x28 0x42126ff9f0 0x0 I verified manually that `traverse_trees_cur_depth` was 562 when that happened, which is far below the 2048 that were already accepted into Git as a hard limit. Despite many attempts to figure out which of the internals trigger this `STATUS_STACK_OVERFLOW` and how to maybe increase certain sizes to avoid running into this issue and let Git behave the same way as under Linux, I failed to find any build-time/runtime knob we could turn to that effect. Note: even switching to using a different allocator (I used mimalloc because that's what Git for Windows uses for its GCC builds) does not help, as the zlib code used to unpack compressed pack entries _still_ uses the regular `malloc()`. And runs into the same issue. Note also: switching to using a different allocator _also_ for zlib code seems _also_ not to help. I tried that, and it still exited with `STATUS_STACK_OVERFLOW` that seems to have been triggered by a `mi_assert_internal()`, i.e. an internal assertion of mimalloc... So the best bet to work around this for now seems to just lower the maximum allowed tree depth _even further_ for MSVC builds. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
432 lines
11 KiB
C
432 lines
11 KiB
C
/*
|
|
* We put all the git config variables in this same object
|
|
* file, so that programs can link against the config parser
|
|
* without having to link against all the rest of git.
|
|
*
|
|
* In particular, no need to bring in libz etc unless needed,
|
|
* even if you might want to know where the git directory etc
|
|
* are.
|
|
*/
|
|
#include "git-compat-util.h"
|
|
#include "abspath.h"
|
|
#include "branch.h"
|
|
#include "convert.h"
|
|
#include "environment.h"
|
|
#include "gettext.h"
|
|
#include "repository.h"
|
|
#include "config.h"
|
|
#include "refs.h"
|
|
#include "fmt-merge-msg.h"
|
|
#include "commit.h"
|
|
#include "strvec.h"
|
|
#include "object-file.h"
|
|
#include "object-store-ll.h"
|
|
#include "path.h"
|
|
#include "replace-object.h"
|
|
#include "tmp-objdir.h"
|
|
#include "chdir-notify.h"
|
|
#include "setup.h"
|
|
#include "shallow.h"
|
|
#include "trace.h"
|
|
#include "write-or-die.h"
|
|
|
|
int trust_executable_bit = 1;
|
|
int trust_ctime = 1;
|
|
int check_stat = 1;
|
|
int has_symlinks = 1;
|
|
int minimum_abbrev = 4, default_abbrev = -1;
|
|
int ignore_case;
|
|
int assume_unchanged;
|
|
int prefer_symlink_refs;
|
|
int is_bare_repository_cfg = -1; /* unspecified */
|
|
int warn_ambiguous_refs = 1;
|
|
int warn_on_object_refname_ambiguity = 1;
|
|
int repository_format_precious_objects;
|
|
const char *git_commit_encoding;
|
|
const char *git_log_output_encoding;
|
|
char *apply_default_whitespace;
|
|
char *apply_default_ignorewhitespace;
|
|
const char *git_attributes_file;
|
|
const char *git_hooks_path;
|
|
int zlib_compression_level = Z_BEST_SPEED;
|
|
int pack_compression_level = Z_DEFAULT_COMPRESSION;
|
|
int fsync_object_files = -1;
|
|
int use_fsync = -1;
|
|
enum fsync_method fsync_method = FSYNC_METHOD_DEFAULT;
|
|
enum fsync_component fsync_components = FSYNC_COMPONENTS_DEFAULT;
|
|
size_t packed_git_window_size = DEFAULT_PACKED_GIT_WINDOW_SIZE;
|
|
size_t packed_git_limit = DEFAULT_PACKED_GIT_LIMIT;
|
|
size_t delta_base_cache_limit = 96 * 1024 * 1024;
|
|
unsigned long big_file_threshold = 512 * 1024 * 1024;
|
|
const char *editor_program;
|
|
const char *askpass_program;
|
|
const char *excludes_file;
|
|
enum auto_crlf auto_crlf = AUTO_CRLF_FALSE;
|
|
enum eol core_eol = EOL_UNSET;
|
|
int global_conv_flags_eol = CONV_EOL_RNDTRP_WARN;
|
|
char *check_roundtrip_encoding = "SHIFT-JIS";
|
|
enum branch_track git_branch_track = BRANCH_TRACK_REMOTE;
|
|
enum rebase_setup_type autorebase = AUTOREBASE_NEVER;
|
|
enum push_default_type push_default = PUSH_DEFAULT_UNSPECIFIED;
|
|
#ifndef OBJECT_CREATION_MODE
|
|
#define OBJECT_CREATION_MODE OBJECT_CREATION_USES_HARDLINKS
|
|
#endif
|
|
enum object_creation_mode object_creation_mode = OBJECT_CREATION_MODE;
|
|
char *notes_ref_name;
|
|
int grafts_keep_true_parents;
|
|
int core_apply_sparse_checkout;
|
|
int core_sparse_checkout_cone;
|
|
int sparse_expect_files_outside_of_patterns;
|
|
int merge_log_config = -1;
|
|
int precomposed_unicode = -1; /* see probe_utf8_pathname_composition() */
|
|
unsigned long pack_size_limit_cfg;
|
|
enum log_refs_config log_all_ref_updates = LOG_REFS_UNSET;
|
|
int max_allowed_tree_depth =
|
|
#ifdef _MSC_VER
|
|
/*
|
|
* When traversing into too-deep trees, Visual C-compiled Git seems to
|
|
* run into some internal stack overflow detection in the
|
|
* `RtlpAllocateHeap()` function that is called from within
|
|
* `git_inflate_init()`'s call tree. The following value seems to be
|
|
* low enough to avoid that by letting Git exit with an error before
|
|
* the stack overflow can occur.
|
|
*/
|
|
512;
|
|
#else
|
|
2048;
|
|
#endif
|
|
|
|
#ifndef PROTECT_HFS_DEFAULT
|
|
#define PROTECT_HFS_DEFAULT 0
|
|
#endif
|
|
int protect_hfs = PROTECT_HFS_DEFAULT;
|
|
|
|
#ifndef PROTECT_NTFS_DEFAULT
|
|
#define PROTECT_NTFS_DEFAULT 1
|
|
#endif
|
|
int protect_ntfs = PROTECT_NTFS_DEFAULT;
|
|
|
|
/*
|
|
* The character that begins a commented line in user-editable file
|
|
* that is subject to stripspace.
|
|
*/
|
|
char comment_line_char = '#';
|
|
int auto_comment_line_char;
|
|
|
|
/* Parallel index stat data preload? */
|
|
int core_preload_index = 1;
|
|
|
|
/* This is set by setup_git_dir_gently() and/or git_default_config() */
|
|
char *git_work_tree_cfg;
|
|
|
|
static char *git_namespace;
|
|
|
|
/*
|
|
* Repository-local GIT_* environment variables; see environment.h for details.
|
|
*/
|
|
const char * const local_repo_env[] = {
|
|
ALTERNATE_DB_ENVIRONMENT,
|
|
CONFIG_ENVIRONMENT,
|
|
CONFIG_DATA_ENVIRONMENT,
|
|
CONFIG_COUNT_ENVIRONMENT,
|
|
DB_ENVIRONMENT,
|
|
GIT_DIR_ENVIRONMENT,
|
|
GIT_WORK_TREE_ENVIRONMENT,
|
|
GIT_IMPLICIT_WORK_TREE_ENVIRONMENT,
|
|
GRAFT_ENVIRONMENT,
|
|
INDEX_ENVIRONMENT,
|
|
NO_REPLACE_OBJECTS_ENVIRONMENT,
|
|
GIT_REPLACE_REF_BASE_ENVIRONMENT,
|
|
GIT_PREFIX_ENVIRONMENT,
|
|
GIT_SHALLOW_FILE_ENVIRONMENT,
|
|
GIT_COMMON_DIR_ENVIRONMENT,
|
|
NULL
|
|
};
|
|
|
|
static char *expand_namespace(const char *raw_namespace)
|
|
{
|
|
struct strbuf buf = STRBUF_INIT;
|
|
struct strbuf **components, **c;
|
|
|
|
if (!raw_namespace || !*raw_namespace)
|
|
return xstrdup("");
|
|
|
|
strbuf_addstr(&buf, raw_namespace);
|
|
components = strbuf_split(&buf, '/');
|
|
strbuf_reset(&buf);
|
|
for (c = components; *c; c++)
|
|
if (strcmp((*c)->buf, "/") != 0)
|
|
strbuf_addf(&buf, "refs/namespaces/%s", (*c)->buf);
|
|
strbuf_list_free(components);
|
|
if (check_refname_format(buf.buf, 0))
|
|
die(_("bad git namespace path \"%s\""), raw_namespace);
|
|
strbuf_addch(&buf, '/');
|
|
return strbuf_detach(&buf, NULL);
|
|
}
|
|
|
|
const char *getenv_safe(struct strvec *argv, const char *name)
|
|
{
|
|
const char *value = getenv(name);
|
|
|
|
if (!value)
|
|
return NULL;
|
|
|
|
strvec_push(argv, value);
|
|
return argv->v[argv->nr - 1];
|
|
}
|
|
|
|
void setup_git_env(const char *git_dir)
|
|
{
|
|
char *git_replace_ref_base;
|
|
const char *shallow_file;
|
|
const char *replace_ref_base;
|
|
struct set_gitdir_args args = { NULL };
|
|
struct strvec to_free = STRVEC_INIT;
|
|
|
|
args.commondir = getenv_safe(&to_free, GIT_COMMON_DIR_ENVIRONMENT);
|
|
args.object_dir = getenv_safe(&to_free, DB_ENVIRONMENT);
|
|
args.graft_file = getenv_safe(&to_free, GRAFT_ENVIRONMENT);
|
|
args.index_file = getenv_safe(&to_free, INDEX_ENVIRONMENT);
|
|
args.alternate_db = getenv_safe(&to_free, ALTERNATE_DB_ENVIRONMENT);
|
|
if (getenv(GIT_QUARANTINE_ENVIRONMENT)) {
|
|
args.disable_ref_updates = 1;
|
|
}
|
|
|
|
repo_set_gitdir(the_repository, git_dir, &args);
|
|
strvec_clear(&to_free);
|
|
|
|
if (getenv(NO_REPLACE_OBJECTS_ENVIRONMENT))
|
|
disable_replace_refs();
|
|
replace_ref_base = getenv(GIT_REPLACE_REF_BASE_ENVIRONMENT);
|
|
git_replace_ref_base = xstrdup(replace_ref_base ? replace_ref_base
|
|
: "refs/replace/");
|
|
update_ref_namespace(NAMESPACE_REPLACE, git_replace_ref_base);
|
|
|
|
free(git_namespace);
|
|
git_namespace = expand_namespace(getenv(GIT_NAMESPACE_ENVIRONMENT));
|
|
shallow_file = getenv(GIT_SHALLOW_FILE_ENVIRONMENT);
|
|
if (shallow_file)
|
|
set_alternate_shallow_file(the_repository, shallow_file, 0);
|
|
}
|
|
|
|
int is_bare_repository(void)
|
|
{
|
|
/* if core.bare is not 'false', let's see if there is a work tree */
|
|
return is_bare_repository_cfg && !get_git_work_tree();
|
|
}
|
|
|
|
int have_git_dir(void)
|
|
{
|
|
return startup_info->have_repository
|
|
|| the_repository->gitdir;
|
|
}
|
|
|
|
const char *get_git_dir(void)
|
|
{
|
|
if (!the_repository->gitdir)
|
|
BUG("git environment hasn't been setup");
|
|
return the_repository->gitdir;
|
|
}
|
|
|
|
const char *get_git_common_dir(void)
|
|
{
|
|
if (!the_repository->commondir)
|
|
BUG("git environment hasn't been setup");
|
|
return the_repository->commondir;
|
|
}
|
|
|
|
const char *get_git_namespace(void)
|
|
{
|
|
if (!git_namespace)
|
|
BUG("git environment hasn't been setup");
|
|
return git_namespace;
|
|
}
|
|
|
|
const char *strip_namespace(const char *namespaced_ref)
|
|
{
|
|
const char *out;
|
|
if (skip_prefix(namespaced_ref, get_git_namespace(), &out))
|
|
return out;
|
|
return NULL;
|
|
}
|
|
|
|
static int git_work_tree_initialized;
|
|
|
|
/*
|
|
* Note. This works only before you used a work tree. This was added
|
|
* primarily to support git-clone to work in a new repository it just
|
|
* created, and is not meant to flip between different work trees.
|
|
*/
|
|
void set_git_work_tree(const char *new_work_tree)
|
|
{
|
|
if (git_work_tree_initialized) {
|
|
struct strbuf realpath = STRBUF_INIT;
|
|
|
|
strbuf_realpath(&realpath, new_work_tree, 1);
|
|
new_work_tree = realpath.buf;
|
|
if (strcmp(new_work_tree, the_repository->worktree))
|
|
die("internal error: work tree has already been set\n"
|
|
"Current worktree: %s\nNew worktree: %s",
|
|
the_repository->worktree, new_work_tree);
|
|
strbuf_release(&realpath);
|
|
return;
|
|
}
|
|
git_work_tree_initialized = 1;
|
|
repo_set_worktree(the_repository, new_work_tree);
|
|
}
|
|
|
|
const char *get_git_work_tree(void)
|
|
{
|
|
return the_repository->worktree;
|
|
}
|
|
|
|
const char *get_object_directory(void)
|
|
{
|
|
if (!the_repository->objects->odb)
|
|
BUG("git environment hasn't been setup");
|
|
return the_repository->objects->odb->path;
|
|
}
|
|
|
|
int odb_mkstemp(struct strbuf *temp_filename, const char *pattern)
|
|
{
|
|
int fd;
|
|
/*
|
|
* we let the umask do its job, don't try to be more
|
|
* restrictive except to remove write permission.
|
|
*/
|
|
int mode = 0444;
|
|
git_path_buf(temp_filename, "objects/%s", pattern);
|
|
fd = git_mkstemp_mode(temp_filename->buf, mode);
|
|
if (0 <= fd)
|
|
return fd;
|
|
|
|
/* slow path */
|
|
/* some mkstemp implementations erase temp_filename on failure */
|
|
git_path_buf(temp_filename, "objects/%s", pattern);
|
|
safe_create_leading_directories(temp_filename->buf);
|
|
return xmkstemp_mode(temp_filename->buf, mode);
|
|
}
|
|
|
|
int odb_pack_keep(const char *name)
|
|
{
|
|
int fd;
|
|
|
|
fd = open(name, O_RDWR|O_CREAT|O_EXCL, 0600);
|
|
if (0 <= fd)
|
|
return fd;
|
|
|
|
/* slow path */
|
|
safe_create_leading_directories_const(name);
|
|
return open(name, O_RDWR|O_CREAT|O_EXCL, 0600);
|
|
}
|
|
|
|
char *get_index_file(void)
|
|
{
|
|
if (!the_repository->index_file)
|
|
BUG("git environment hasn't been setup");
|
|
return the_repository->index_file;
|
|
}
|
|
|
|
char *get_graft_file(struct repository *r)
|
|
{
|
|
if (!r->graft_file)
|
|
BUG("git environment hasn't been setup");
|
|
return r->graft_file;
|
|
}
|
|
|
|
static void set_git_dir_1(const char *path)
|
|
{
|
|
xsetenv(GIT_DIR_ENVIRONMENT, path, 1);
|
|
setup_git_env(path);
|
|
}
|
|
|
|
static void update_relative_gitdir(const char *name UNUSED,
|
|
const char *old_cwd,
|
|
const char *new_cwd,
|
|
void *data UNUSED)
|
|
{
|
|
char *path = reparent_relative_path(old_cwd, new_cwd, get_git_dir());
|
|
struct tmp_objdir *tmp_objdir = tmp_objdir_unapply_primary_odb();
|
|
|
|
trace_printf_key(&trace_setup_key,
|
|
"setup: move $GIT_DIR to '%s'",
|
|
path);
|
|
set_git_dir_1(path);
|
|
if (tmp_objdir)
|
|
tmp_objdir_reapply_primary_odb(tmp_objdir, old_cwd, new_cwd);
|
|
free(path);
|
|
}
|
|
|
|
void set_git_dir(const char *path, int make_realpath)
|
|
{
|
|
struct strbuf realpath = STRBUF_INIT;
|
|
|
|
if (make_realpath) {
|
|
strbuf_realpath(&realpath, path, 1);
|
|
path = realpath.buf;
|
|
}
|
|
|
|
set_git_dir_1(path);
|
|
if (!is_absolute_path(path))
|
|
chdir_notify_register(NULL, update_relative_gitdir, NULL);
|
|
|
|
strbuf_release(&realpath);
|
|
}
|
|
|
|
const char *get_log_output_encoding(void)
|
|
{
|
|
return git_log_output_encoding ? git_log_output_encoding
|
|
: get_commit_output_encoding();
|
|
}
|
|
|
|
const char *get_commit_output_encoding(void)
|
|
{
|
|
return git_commit_encoding ? git_commit_encoding : "UTF-8";
|
|
}
|
|
|
|
static int the_shared_repository = PERM_UMASK;
|
|
static int need_shared_repository_from_config = 1;
|
|
|
|
void set_shared_repository(int value)
|
|
{
|
|
the_shared_repository = value;
|
|
need_shared_repository_from_config = 0;
|
|
}
|
|
|
|
int get_shared_repository(void)
|
|
{
|
|
if (need_shared_repository_from_config) {
|
|
const char *var = "core.sharedrepository";
|
|
const char *value;
|
|
if (!git_config_get_value(var, &value))
|
|
the_shared_repository = git_config_perm(var, value);
|
|
need_shared_repository_from_config = 0;
|
|
}
|
|
return the_shared_repository;
|
|
}
|
|
|
|
void reset_shared_repository(void)
|
|
{
|
|
need_shared_repository_from_config = 1;
|
|
}
|
|
|
|
int use_optional_locks(void)
|
|
{
|
|
return git_env_bool(GIT_OPTIONAL_LOCKS_ENVIRONMENT, 1);
|
|
}
|
|
|
|
int print_sha1_ellipsis(void)
|
|
{
|
|
/*
|
|
* Determine if the calling environment contains the variable
|
|
* GIT_PRINT_SHA1_ELLIPSIS set to "yes".
|
|
*/
|
|
static int cached_result = -1; /* unknown */
|
|
|
|
if (cached_result < 0) {
|
|
const char *v = getenv("GIT_PRINT_SHA1_ELLIPSIS");
|
|
cached_result = (v && !strcasecmp(v, "yes"));
|
|
}
|
|
return cached_result;
|
|
}
|