Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history
* maint:
  config.c:store_write_pair(): don't read the byte before a malloc'd buffer.
  • Loading branch information
Junio C Hamano committed Dec 9, 2007
2 parents 774751a + 6281f39 commit 9b433e4
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions config.c
Original file line number Diff line number Diff line change
Expand Up @@ -646,13 +646,19 @@ static int store_write_pair(int fd, const char* key, const char* value)
int length = strlen(key+store.baselen+1);
int quote = 0;

/* Check to see if the value needs to be quoted. */
/*
* Check to see if the value needs to be surrounded with a dq pair.
* Note that problematic characters are always backslash-quoted; this
* check is about not losing leading or trailing SP and strings that
* follow beginning-of-comment characters (i.e. ';' and '#') by the
* configuration parser.
*/
if (value[0] == ' ')
quote = 1;
for (i = 0; value[i]; i++)
if (value[i] == ';' || value[i] == '#')
quote = 1;
if (value[i-1] == ' ')
if (i && value[i-1] == ' ')
quote = 1;

if (write_in_full(fd, "\t", 1) != 1 ||
Expand Down

0 comments on commit 9b433e4

Please sign in to comment.