Skip to content

Commit 81d67e4

Browse files
committed
Handle std::range_error (from count_utf16_to_utf8) like web::uri_exception
1 parent 28919d0 commit 81d67e4

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Release/src/http/listener/http_server_asio.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ will_deref_and_erase_t asio_server_connection::handle_http_line(const boost::sys
637637
{
638638
m_request.set_request_uri(utility::conversions::to_string_t(http_path_and_version.substr(1, http_path_and_version.size() - VersionPortionSize - 1)));
639639
}
640-
catch(const web::uri_exception &e)
640+
catch (const std::exception& e) // may be std::range_error indicating invalid Unicode, or web::uri_exception
641641
{
642642
m_request.reply(status_codes::BadRequest, e.what());
643643
m_close = true;
@@ -913,7 +913,7 @@ will_deref_and_erase_t asio_server_connection::dispatch_request_to_listener()
913913
{
914914
pListener = m_p_parent->find_listener(m_request.relative_uri());
915915
}
916-
catch (const web::uri_exception&)
916+
catch (const std::exception&) // may be web::uri_exception, or std::range_error indicating invalid Unicode
917917
{
918918
m_request.reply(status_codes::BadRequest);
919919
(will_erase_from_parent_t)do_response();

0 commit comments

Comments
 (0)