Fixed bug in function Utils::explode

awwit · awwit · commit 946e0dcda5b4 · 2017-08-02T15:40:38.000+03:00
Decode url before file search
diff --git a/src/Init.cpp b/src/Init.cpp
@@ -34,10 +34,10 @@ std::string getClearPath(const std::string &path)
 
 	if (std::string::npos == pos)
 	{
-		return path;
+		return Utils::urlDecode(path);
 	}
 
-	return std::string(path.cbegin(), path.cbegin() + pos);
+	return Utils::urlDecode(path.substr(0, pos) );
 }
 
 static void getIncomingVars(std::unordered_multimap<std::string, std::string> &params, const std::string &uri)
diff --git a/src/utils/Utils.cpp b/src/utils/Utils.cpp
@@ -55,9 +55,9 @@ namespace Utils
 
 		for (size_t pos = 0; std::string::npos != pos;)
 		{
-			size_t delimiter = str.find(sep, pos);
+			const size_t delimiter = str.find(sep, pos);
 
-			std::string value = str.substr(pos, delimiter);
+			std::string value = str.substr(pos, delimiter - pos);
 			trim(value);
 
 			values.emplace_back(std::move(value) );
@@ -865,4 +865,4 @@ namespace Utils
 
 		return decoded;
 	}
-};
+}
diff --git a/src/utils/Utils.h b/src/utils/Utils.h
@@ -137,4 +137,4 @@ namespace Utils
 
 	std::string urlEncode(const std::string &str);
 	std::string urlDecode(const std::string &str);
-};
+}

Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,10 @@ std::string getClearPath(const std::string &path)`
`34`	`34`
`35`	`35`	`if (std::string::npos == pos)`
`36`	`36`	`{`
`37`		`- return path;`
	`37`	`+ return Utils::urlDecode(path);`
`38`	`38`	`}`
`39`	`39`
`40`		`- return std::string(path.cbegin(), path.cbegin() + pos);`
	`40`	`+ return Utils::urlDecode(path.substr(0, pos) );`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`static void getIncomingVars(std::unordered_multimap<std::string, std::string> &params, const std::string &uri)`
Original file line number	Diff line number	Diff line change
`@@ -55,9 +55,9 @@ namespace Utils`
`55`	`55`
`56`	`56`	`for (size_t pos = 0; std::string::npos != pos;)`
`57`	`57`	`{`
`58`		`- size_t delimiter = str.find(sep, pos);`
	`58`	`+ const size_t delimiter = str.find(sep, pos);`
`59`	`59`
`60`		`- std::string value = str.substr(pos, delimiter);`
	`60`	`+ std::string value = str.substr(pos, delimiter - pos);`
`61`	`61`	`trim(value);`
`62`	`62`
`63`	`63`	`values.emplace_back(std::move(value) );`
`@@ -865,4 +865,4 @@ namespace Utils`
`865`	`865`
`866`	`866`	`return decoded;`
`867`	`867`	`}`
`868`		`-};`
	`868`	`+}`