proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-29 15:10:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1763 from nvloff/nameless_submodule_segfault

Browse Source 
submodule: check alloc and name presence
This commit is contained in:
Russell Belfer 2013-08-05 13:33:44 -07:00
commit ee77378d9b
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/submodule.c
View File

@ -1025,6 +1025,7 @@ static int submodule_get(
if (!git_strmap_valid_index(smcfg, pos)) { if (!git_strmap_valid_index(smcfg, pos)) {
sm = submodule_alloc(repo, name); sm = submodule_alloc(repo, name);
GITERR_CHECK_ALLOC(sm);
/* insert value at name - if another thread beats us to it, then use /* insert value at name - if another thread beats us to it, then use
* their record and release our own. * their record and release our own.
@ -1101,8 +1102,10 @@ static int submodule_load_from_config(
namestart = key + strlen("submodule."); namestart = key + strlen("submodule.");
property = strrchr(namestart, '.'); property = strrchr(namestart, '.');
if (property == NULL)
if (!property || (property == namestart))
return 0; return 0;
property++; property++;
is_path = (strcasecmp(property, "path") == 0); is_path = (strcasecmp(property, "path") == 0);

3
tests-clar/resources/submodules/gitmodules
View File

@ -1,3 +1,6 @@
[submodule "testrepo"] [submodule "testrepo"]
path = testrepo
url =
[submodule ""]
path = testrepo path = testrepo
url = url =