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

Revert use of backslash as an escape for double quote in config strings

Browse Source
This commit is contained in:
Asanka C. Herath
2010-12-02 23:24:46 -05:00
parent dd6d5a0e2c
commit e0e746b1ca
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/krb5/config_file.c
View File

@@ -877,12 +877,7 @@ next_component_string(char * begin, char * delims, char **state)
end = begin;
while (*end == '"') {
char * t;
while ((t = strchr(end + 1, '"')) != NULL && *(t - 1) == '\\') {
--t;
memmove(t, t + 1, strlen(t));
end = t;
}
char * t = strchr(end + 1, '"');
if (t)
end = ++t;

6
lib/krb5/test_config.c
View File

@@ -136,7 +136,7 @@ const char *config_string_result3[] = {
};
const char *config_string_result4[] = {
"\"\"", "\"", "\"", NULL
"\"\"", "", "\"\"", NULL
};
const char *config_string_result5[] = {
@@ -148,11 +148,11 @@ const char *config_string_result6[] = {
};
const char *config_string_result7[] = {
"Snape\"Kills Dumbledore\"", NULL
"SnapeKills\\", "Dumbledore", NULL
};
const char *config_string_result8[] = {
"\"TownOf\"Sandwich: Massachusetts\"Oldest", "Town", "In", "Cape Cod", NULL
"\"TownOf Sandwich: Massachusetts\"Oldest", "Town", "In", "Cape Cod", NULL
};
const char *config_string_result9[] = {

6
lib/krb5/test_config_strings.cfg
View File

@@ -3,10 +3,10 @@
bar = A B "C D"
baz = A B ""
quux = "A B;C: D"
questionable="""" "\"" "\""
questionable="""" "" """"
mismatch1 = A"BQd
mismatch2 = efgh" ABC
internal1 = "Snape\"Kills Dumbledore\""
internal2 = "TownOf\"Sandwich: Massachusetts"Oldest Town In "Cape Cod"
internal1 = "SnapeKills\" "Dumbledore"
internal2 = "TownOf Sandwich: Massachusetts"Oldest Town In "Cape Cod"
internal3 = "Begins and"ends In One String
longer_strings = "Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:" "1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer." "2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution." "3. Neither the name of the Institute nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission." "THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." "Why do we test with such long strings? Because some people have config files" That look "Like this."