Commit947cc7e

committed

Merge pull request#553 from cnagune/0.11-devel-fix-decode-percent

fix boost::network::uri::decode error - out of range because of '%'

2 parentsb540ff3 +8f5831f commit947cc7eCopy full SHA for 947cc7e

File tree

+10

-2

lines changed

+10

-2

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`#include<boost/range/begin.hpp>`
`11`	`11`	`#include<boost/range/end.hpp>`
`12`	`12`	`#include<cassert>`
	`13`	`+#include<stdexcept>`
`13`	`14`
`14`	`15`	`namespaceboost {`
`15`	`16`	`namespacenetwork {`
`@@ -58,9 +59,9 @@ OutputIterator decode(const InputIterator &in_begin,`
`58`	`59`	`OutputIterator out = out_begin;`
`59`	`60`	`while (it != in_end) {`
`60`	`61`	`if (*it =='%') {`
`61`		`-++it;`
	`62`	`+if (++it == in_end)throwstd::out_of_range("unexpected end of stream");`
`62`	`63`	`value_type v0 =detail::letter_to_hex(*it);`
`63`		`-++it;`
	`64`	`+if (++it == in_end)throwstd::out_of_range("unexpected end of stream");`
`64`	`65`	`value_type v1 =detail::letter_to_hex(*it);`
`65`	`66`	`++it;`
`66`	`67`	`out++ =0x10 v0 + v1;`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,3 +47,10 @@ BOOST_AUTO_TEST_CASE(decoding_multibyte_test) {`
`47`	`47`	`uri::decode(encoded,std::back_inserter(instance));`
`48`	`48`	`BOOST_CHECK_EQUAL(instance, unencoded);`
`49`	`49`	`}`
	`50`	`+`
	`51`	`+BOOST_AUTO_TEST_CASE(decoding_throw_test) {`
	`52`	`+const std::stringencoded("%");`
	`53`	`+`
	`54`	`+ std::string instance;`
	`55`	`+BOOST_CHECK_THROW(uri::decoded(encoded), std::out_of_range);`
	`56`	`+}`

Comments

(0)