Fix unsafe usage of boost::as_literal, caught by memory sanitiser

deanberris · deanberris · commit 600daffef438 · 2015-11-17T01:15:51.000+11:00
diff --git a/boost/network/uri/uri.hpp b/boost/network/uri/uri.hpp
@@ -310,7 +310,10 @@ inline bool operator==(const uri::string_type &lhs, const uri &rhs) {
 }
 
 inline bool operator==(const uri &lhs, const uri::value_type *rhs) {
-  return boost::equal(lhs, boost::as_literal(rhs));
+  auto rlen = strlen(rhs);
+  auto llen = std::distance(lhs.begin(), lhs.end());
+  if (rlen != std::abs(llen)) return false;
+  return boost::equal(lhs, boost::make_iterator_range(rhs, rhs + rlen));
 }
 
 inline bool operator==(const uri::value_type *lhs, const uri &rhs) {

Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,10 @@ inline bool operator==(const uri::string_type &lhs, const uri &rhs) {`
`310`	`310`	`}`
`311`	`311`
`312`	`312`	`inline bool operator==(const uri &lhs, const uri::value_type *rhs) {`
`313`		`- return boost::equal(lhs, boost::as_literal(rhs));`
	`313`	`+ auto rlen = strlen(rhs);`
	`314`	`+ auto llen = std::distance(lhs.begin(), lhs.end());`
	`315`	`+ if (rlen != std::abs(llen)) return false;`
	`316`	`+ return boost::equal(lhs, boost::make_iterator_range(rhs, rhs + rlen));`
`314`	`317`	`}`
`315`	`318`
`316`	`319`	`inline bool operator==(const uri::value_type *lhs, const uri &rhs) {`