oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Deal with backslash escaped quotes

Browse Source
This commit is contained in:
Asanka C. Herath
2010-11-26 00:35:31 -05:00
parent d58d572e60
commit f974c34580
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/krb5/config_file.c
View File

@@ -877,7 +877,13 @@ next_component_string(char * begin, char * delims, char **state)
end = begin; end = begin;
while (*end == '"') { while (*end == '"') {
char * t = strchr(end + 1, '"'); char * t;
while ((t = strchr(end + 1, '"')) != NULL && *(t - 1) == '\\') {
--t;
memmove(t, t + 1, strlen(t));
end = t;
}
if (t) if (t)
end = ++t; end = ++t;
else else
@@ -894,14 +900,14 @@ next_component_string(char * begin, char * delims, char **state)
if (*end != '\0') { if (*end != '\0') {
*end = '\0'; *end = '\0';
*state = end + 1; *state = end + 1;
if (*begin == '"' && *(end - 1) == '"') { if (*begin == '"' && *(end - 1) == '"' && begin + 1 < end) {
begin++; *(end - 1) = '\0'; begin++; *(end - 1) = '\0';
} }
return begin; return begin;
} }
*state = end; *state = end;
if (*begin == '"' && *(end - 1) == '"') { if (*begin == '"' && *(end - 1) == '"' && begin + 1 < end) {
begin++; *(end - 1) = '\0'; begin++; *(end - 1) = '\0';
} }
return begin; return begin;