Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
1bbdf15d
Unverified
Commit
1bbdf15d
authored
Jun 01, 2020
by
Patrick Steinhardt
Committed by
GitHub
Jun 01, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5527 from libgit2/ethomson/config_unreadable
Handle unreadable configuration files
parents
89ddd0fc
9df69223
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
0 deletions
+26
-0
src/config_file.c
+9
-0
tests/config/read.c
+17
-0
No files found.
src/config_file.c
View file @
1bbdf15d
...
...
@@ -111,6 +111,15 @@ static int config_file_open(git_config_backend *cfg, git_config_level_t level, c
if
(
!
git_path_exists
(
b
->
file
.
path
))
return
0
;
/*
* git silently ignores configuration files that are not
* readable. We emulate that behavior. This is particularly
* important for sandboxed applications on macOS where the
* git configuration files may not be readable.
*/
if
(
p_access
(
b
->
file
.
path
,
R_OK
)
<
0
)
return
GIT_ENOTFOUND
;
if
(
res
<
0
||
(
res
=
config_file_read
(
b
->
entries
,
repo
,
&
b
->
file
,
level
,
0
))
<
0
)
{
git_config_entries_free
(
b
->
entries
);
b
->
entries
=
NULL
;
...
...
tests/config/read.c
View file @
1bbdf15d
...
...
@@ -849,6 +849,23 @@ void test_config_read__invalid_quoted_third_section(void)
git_config_free
(
cfg
);
}
void
test_config_read__unreadable_file_ignored
(
void
)
{
git_buf
buf
=
GIT_BUF_INIT
;
git_config
*
cfg
;
int
ret
;
cl_set_cleanup
(
&
clean_test_config
,
NULL
);
cl_git_mkfile
(
"./testconfig"
,
"[some] var = value
\n
[some
\"
OtheR
\"
] var = value"
);
cl_git_pass
(
p_chmod
(
"./testconfig"
,
0
));
ret
=
git_config_open_ondisk
(
&
cfg
,
"./test/config"
);
cl_assert
(
ret
==
0
||
ret
==
GIT_ENOTFOUND
);
git_config_free
(
cfg
);
git_buf_dispose
(
&
buf
);
}
void
test_config_read__single_line
(
void
)
{
git_buf
buf
=
GIT_BUF_INIT
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment