diff options
| author | Patrick Steinhardt <ps@pks.im> | 2020-09-18 10:43:34 +0200 |
|---|---|---|
| committer | Patrick Steinhardt <ps@pks.im> | 2020-09-18 11:03:32 +0200 |
| commit | b254a5856589e06d5ef66bfb7c7b2127249f440e (patch) | |
| tree | d22a735dc497b6cd5e6709bea783ccba12d3927d | |
| parent | 37ae00799395637a37c306b8d1c41ae08f41acda (diff) | |
| download | libgit2-b254a5856589e06d5ef66bfb7c7b2127249f440e.tar.gz | |
sysdir: fix formatting error message with NULL stringpks-release-build-warnings
When trying to the template dir, we pass in a `NULL` pointer for the
filename. That's perfectly fine, but if we're failing to find the
template directory then we'll creat an error message with the `NULL`
pointer passed in.
Fix the issue by setting different error messages based on whether the
filename is given or not. This even makes sense, as we're not searching
for a file in case we have no `name`, but for a directory. So the error
would've been misleading anyway.
| -rw-r--r-- | src/sysdir.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/sysdir.c b/src/sysdir.c index bcef97c03..6dc78c8fd 100644 --- a/src/sysdir.c +++ b/src/sysdir.c @@ -298,8 +298,11 @@ static int git_sysdir_find_in_dirlist( } done: + if (name) + git_error_set(GIT_ERROR_OS, "the %s file '%s' doesn't exist", label, name); + else + git_error_set(GIT_ERROR_OS, "the %s directory doesn't exist", label); git_buf_dispose(path); - git_error_set(GIT_ERROR_OS, "the %s file '%s' doesn't exist", label, name); return GIT_ENOTFOUND; } |