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
95a0ab89
Commit
95a0ab89
authored
May 24, 2018
by
Carlos Martín Nieto
Committed by
Patrick Steinhardt
Jun 01, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
submodule: plug leaks from the escape detection
parent
d1aaa5e2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
3 deletions
+12
-3
src/submodule.c
+10
-3
tests/submodule/escape.c
+2
-0
No files found.
src/submodule.c
View file @
95a0ab89
...
@@ -186,10 +186,13 @@ static int load_submodule_names(git_strmap *out, git_repository *repo, git_confi
...
@@ -186,10 +186,13 @@ static int load_submodule_names(git_strmap *out, git_repository *repo, git_confi
fdot
=
strchr
(
entry
->
name
,
'.'
);
fdot
=
strchr
(
entry
->
name
,
'.'
);
ldot
=
strrchr
(
entry
->
name
,
'.'
);
ldot
=
strrchr
(
entry
->
name
,
'.'
);
git_buf_clear
(
&
buf
);
git_buf_put
(
&
buf
,
fdot
+
1
,
ldot
-
fdot
-
1
);
git_buf_put
(
&
buf
,
fdot
+
1
,
ldot
-
fdot
-
1
);
isvalid
=
git_submodule_name_is_valid
(
repo
,
buf
.
ptr
,
0
);
isvalid
=
git_submodule_name_is_valid
(
repo
,
buf
.
ptr
,
0
);
if
(
isvalid
<
0
)
if
(
isvalid
<
0
)
{
return
isvalid
;
error
=
isvalid
;
goto
out
;
}
if
(
!
isvalid
)
if
(
!
isvalid
)
continue
;
continue
;
...
@@ -199,9 +202,13 @@ static int load_submodule_names(git_strmap *out, git_repository *repo, git_confi
...
@@ -199,9 +202,13 @@ static int load_submodule_names(git_strmap *out, git_repository *repo, git_confi
return
-
1
;
return
-
1
;
}
}
}
}
if
(
error
==
GIT_ITEROVER
)
error
=
0
;
out:
git_buf_free
(
&
buf
);
git_config_iterator_free
(
iter
);
git_config_iterator_free
(
iter
);
return
0
;
return
error
;
}
}
int
git_submodule_lookup
(
int
git_submodule_lookup
(
...
...
tests/submodule/escape.c
View file @
95a0ab89
...
@@ -43,6 +43,7 @@ void test_submodule_escape__from_gitdir(void)
...
@@ -43,6 +43,7 @@ void test_submodule_escape__from_gitdir(void)
"[submodule
\"
"
EVIL_SM_NAME
"
\"
]
\n
"
"[submodule
\"
"
EVIL_SM_NAME
"
\"
]
\n
"
" path = testrepo
\n
"
" path = testrepo
\n
"
" url = ../testrepo.git
\n
"
);
" url = ../testrepo.git
\n
"
);
git_buf_free
(
&
buf
);
/* Find it all the different ways we know about it */
/* Find it all the different ways we know about it */
foundit
=
0
;
foundit
=
0
;
...
@@ -76,6 +77,7 @@ void test_submodule_escape__from_gitdir_windows(void)
...
@@ -76,6 +77,7 @@ void test_submodule_escape__from_gitdir_windows(void)
"[submodule
\"
"
EVIL_SM_NAME_WINDOWS
"
\"
]
\n
"
"[submodule
\"
"
EVIL_SM_NAME_WINDOWS
"
\"
]
\n
"
" path = testrepo
\n
"
" path = testrepo
\n
"
" url = ../testrepo.git
\n
"
);
" url = ../testrepo.git
\n
"
);
git_buf_free
(
&
buf
);
/* Find it all the different ways we know about it */
/* Find it all the different ways we know about it */
foundit
=
0
;
foundit
=
0
;
...
...
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