Skip to content

allow building when cpp exceptions are disabled #488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
arenevier wants to merge 1 commit into from
Closed

allow building when cpp exceptions are disabled #488

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion ixwebsocket/IXHttp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ namespace ix
if (headers.find("Content-Length") != headers.end())
{
int contentLength = 0;
#ifdef __cpp_exceptions
try
{
contentLength = std::stoi(headers["Content-Length"]);
Expand All @@ -142,7 +143,22 @@ namespace ix
return std::make_tuple(
false, "Error parsing HTTP Header 'Content-Length'", httpRequest);
}

#else
{
const char* p = headers["Content-Length"].c_str();
char* p_end{};
errno = 0;
long val = std::strtol(p, &p_end, 10);
if (p_end == p // invalid argument
|| errno == ERANGE // out of range
|| val < std::numeric_limits<int>::min()
|| val > std::numeric_limits<int>::max()) {
return std::make_tuple(
false, "Error parsing HTTP Header 'Content-Length'", httpRequest);
}
contentLength = val;
}
#endif
if (contentLength < 0)
{
return std::make_tuple(
Expand Down