Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity

fix some more issues with buffer ending before decisions are finished.

Browse source
This commit is contained in:
Enno Rehling 2018-10-01 02:26:31 +02:00
parent b1cd9bcfef
commit 90b80aba89
2 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/util/order_parser.c
View file

@ -144,7 +144,21 @@ static enum OP_Status parse_buffer(OP_Parser parser, int isFinal)
} }
else { else {
/* this is not multi-line input yet, so do nothing */ /* this is not multi-line input yet, so do nothing */
pos = strpbrk(pos + 1, "\\;\n"); if (pos[1] == '\0') {
/* end of available input */
if (isFinal) {
/* input ends on a pointless backslash, kill it */
pos[0] = '\0';
pos = NULL;
}
else {
/* backslash is followed by data that we do not know */
pos = NULL;
}
}
else {
pos = strpbrk(pos + 1, "\\;\n");
}
} }
break; break;
case ';': case ';':

12
src/util/order_parser.test.c
View file

@ -32,27 +32,39 @@ static void test_parse_orders(CuTest *tc) {
OP_SetUserData(parser, lastline); OP_SetUserData(parser, lastline);
OP_SetOrderHandler(parser, copy_line); OP_SetOrderHandler(parser, copy_line);
CuAssertPtrNotNull(tc, parser); CuAssertPtrNotNull(tc, parser);
lastline[0] = 0;
CuAssertIntEquals(tc, OP_STATUS_OK, OP_Parse(parser, "Hello World", 11, 1)); CuAssertIntEquals(tc, OP_STATUS_OK, OP_Parse(parser, "Hello World", 11, 1));
CuAssertStrEquals(tc, "Hello World", lastline); CuAssertStrEquals(tc, "Hello World", lastline);
OP_ParserReset(parser); OP_ParserReset(parser);
lastline[0] = 0;
CuAssertIntEquals(tc, OP_STATUS_OK, OP_Parse(parser, "Hello World\n", 12, 1)); CuAssertIntEquals(tc, OP_STATUS_OK, OP_Parse(parser, "Hello World\n", 12, 1));
CuAssertStrEquals(tc, "Hello World", lastline); CuAssertStrEquals(tc, "Hello World", lastline);
OP_ParserReset(parser); OP_ParserReset(parser);
lastline[0] = 0;
CuAssertIntEquals(tc, OP_STATUS_OK, OP_Parse(parser, "Hello\\\n World", 13, 1)); CuAssertIntEquals(tc, OP_STATUS_OK, OP_Parse(parser, "Hello\\\n World", 13, 1));
CuAssertStrEquals(tc, "Hello World", lastline); CuAssertStrEquals(tc, "Hello World", lastline);
OP_ParserReset(parser); OP_ParserReset(parser);
lastline[0] = 0;
CuAssertIntEquals(tc, OP_STATUS_OK, OP_Parse(parser, "Hello;World", 11, 1)); CuAssertIntEquals(tc, OP_STATUS_OK, OP_Parse(parser, "Hello;World", 11, 1));
CuAssertStrEquals(tc, "Hello", lastline); CuAssertStrEquals(tc, "Hello", lastline);
OP_ParserReset(parser); OP_ParserReset(parser);
lastline[0] = 0;
CuAssertIntEquals(tc, OP_STATUS_OK, OP_Parse(parser, "Hello\\World", 11, 1)); CuAssertIntEquals(tc, OP_STATUS_OK, OP_Parse(parser, "Hello\\World", 11, 1));
CuAssertStrEquals(tc, "Hello\\World", lastline); CuAssertStrEquals(tc, "Hello\\World", lastline);
OP_ParserReset(parser); OP_ParserReset(parser);
lastline[0] = 0;
CuAssertIntEquals(tc, OP_STATUS_OK, OP_Parse(parser, "Hello ", 6, 0)); CuAssertIntEquals(tc, OP_STATUS_OK, OP_Parse(parser, "Hello ", 6, 0));
CuAssertIntEquals(tc, OP_STATUS_OK, OP_Parse(parser, "World", 5, 1)); CuAssertIntEquals(tc, OP_STATUS_OK, OP_Parse(parser, "World", 5, 1));
CuAssertStrEquals(tc, "Hello World", lastline); CuAssertStrEquals(tc, "Hello World", lastline);
OP_ParserReset(parser); OP_ParserReset(parser);
lastline[0] = 0;
CuAssertIntEquals(tc, OP_STATUS_OK, OP_Parse(parser, "Hello\\World \\", 14, 1)); CuAssertIntEquals(tc, OP_STATUS_OK, OP_Parse(parser, "Hello\\World \\", 14, 1));
CuAssertStrEquals(tc, "Hello\\World ", lastline); CuAssertStrEquals(tc, "Hello\\World ", lastline);
OP_ParserReset(parser);
lastline[0] = 0;
CuAssertIntEquals(tc, OP_STATUS_OK, OP_Parse(parser, "Hello \\", 7, 0));
CuAssertIntEquals(tc, OP_STATUS_OK, OP_Parse(parser, "\nWorld", 6, 1));
CuAssertStrEquals(tc, "Hello World", lastline);
OP_ParserFree(parser); OP_ParserFree(parser);
} }