Commit 0f674411 by Vicent Martí

Merge pull request #1052 from delanne/invalid_read

Valgrind reports Invalid Read when the configuration file contains some empty line
parents 4d062d25 bcad677b
...@@ -924,7 +924,7 @@ static int strip_comments(char *line, int in_quotes) ...@@ -924,7 +924,7 @@ static int strip_comments(char *line, int in_quotes)
} }
/* skip any space at the end */ /* skip any space at the end */
if (git__isspace(ptr[-1])) { if (ptr > line && git__isspace(ptr[-1])) {
ptr--; ptr--;
} }
ptr[0] = '\0'; ptr[0] = '\0';
...@@ -1398,7 +1398,7 @@ static int parse_variable(diskfile_backend *cfg, char **var_name, char **var_val ...@@ -1398,7 +1398,7 @@ static int parse_variable(diskfile_backend *cfg, char **var_name, char **var_val
value_start = var_end + 1; value_start = var_end + 1;
do var_end--; do var_end--;
while (git__isspace(*var_end)); while (var_end>line && git__isspace(*var_end));
*var_name = git__strndup(line, var_end - line + 1); *var_name = git__strndup(line, var_end - line + 1);
GITERR_CHECK_ALLOC(*var_name); GITERR_CHECK_ALLOC(*var_name);
......
[remote "fancy"] [remote "fancy"]
url = git://github.com/libgit2/libgit2 url = git://github.com/libgit2/libgit2
url = git://git.example.com/libgit2 url = git://git.example.com/libgit2
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment