lib/cpp-httplib
1
0
Fork 0
mirror of synced 2025-04-26 14:28:51 +03:00
Code

Fix #74

Browse Source
This commit is contained in:
yhirose 2018-06-01 23:04:17 -04:00
parent 5b3187e2f9
commit 2bb27aa25d
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
httplib.h
View File

@ -938,8 +938,12 @@ inline bool is_hex(char c, int& v)
return false;
}
inline bool from_hex_to_i(const std::string& s, int i, int cnt, int& val)
inline bool from_hex_to_i(const std::string& s, size_t i, size_t cnt, int& val)
{
if (i >= s.size()) {
return false;
}
val = 0;
for (; cnt; i++, cnt--) {
if (!s[i]) {
@ -992,8 +996,8 @@ inline std::string decode_url(const std::string& s)
{
std::string result;
for (int i = 0; s[i]; i++) {
if (s[i] == '%') {
for (size_t i = 0; s[i]; i++) {
if (s[i] == '%' && i + 1 < s.size()) {
if (s[i + 1] && s[i + 1] == 'u') {
int val = 0;
if (from_hex_to_i(s, i + 2, 4, val)) {

7
test/test.cc
View File

@ -643,6 +643,13 @@ TEST_F(ServerTest, InvalidPercentEncodingUnicode)
EXPECT_EQ(404, res->status);
}
TEST_F(ServerTest, EndWithPercentCharacterInQuery)
{
auto res = cli_.Get("/hello?aaa=bbb%");
ASSERT_TRUE(res != nullptr);
EXPECT_EQ(404, res->status);
}
TEST_F(ServerTest, MultipartFormData)
{
Request req;