diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-03-12 23:21:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-12 23:21:33 -0700 |
| commit | ba37c92df905a5bc51efe76e32f0e67c4ad5acbe (patch) | |
| tree | a01300f6b0ae623259f04aa38cca91f6f5f81047 /abspath.c | |
| parent | fb070d2f17b0619cbc1be0606fd452b2294abb8d (diff) | |
| parent | ce83eadd9a2c63db6263df91933da1b1b865d26a (diff) | |
| download | git-ba37c92df905a5bc51efe76e32f0e67c4ad5acbe.tar.gz | |
Merge branch 'js/realpath-pathdup-fix'
Git v2.12 was shipped with an embarrassing breakage where various
operations that verify paths given from the user stopped dying when
seeing an issue, and instead later triggering segfault.
* js/realpath-pathdup-fix:
real_pathdup(): fix callsites that wanted it to die on error
t1501: demonstrate NULL pointer access with invalid GIT_WORK_TREE
Diffstat (limited to 'abspath.c')
| -rw-r--r-- | abspath.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -214,12 +214,12 @@ const char *real_path_if_valid(const char *path) return strbuf_realpath(&realpath, path, 0); } -char *real_pathdup(const char *path) +char *real_pathdup(const char *path, int die_on_error) { struct strbuf realpath = STRBUF_INIT; char *retval = NULL; - if (strbuf_realpath(&realpath, path, 0)) + if (strbuf_realpath(&realpath, path, die_on_error)) retval = strbuf_detach(&realpath, NULL); strbuf_release(&realpath); |