external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

For#1508, check the error correctly for strtol.

Browse source
This commit is contained in:
winlin 2019-12-20 16:48:51 +08:00
parent cab15c348c
commit da7e76c96a
3 changed files with 211 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
trunk/src/service/srs_service_http_conn.cpp
View file

@ -992,15 +992,14 @@ srs_error_t SrsHttpResponseReader::read_chunked(char* data, int nb_data, int* nb
at[length - 1] = 0;
at[length - 2] = 0;
// The at is length in string, it must be all digital.
if (!srs_is_digit_number(at)) {
return srs_error_new(ERROR_HTTP_INVALID_CHUNK_HEADER, "invalid length=%s", at);
}
// size is the bytes size, excludes the chunk header and end CRLF.
int ilength = (int)::strtol(at, NULL, 16);
if (ilength < 0) {
return srs_error_new(ERROR_HTTP_INVALID_CHUNK_HEADER, "invalid length=%s as %d", at, ilength);
// @remark It must be hex format, please read https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Transfer-Encoding#Directives
// @remark For strtol, note that: If no conversion could be performed, 0 is returned and the global variable errno is set to EINVAL.
char* at_parsed = at; errno = 0;
int ilength = (int)::strtol(at, &at_parsed, 16);
if (ilength < 0 || errno != 0 || at_parsed - at != length - 2) {
return srs_error_new(ERROR_HTTP_INVALID_CHUNK_HEADER, "invalid length %s as %d, parsed=%.*s, errno=%d",
at, ilength, (int)(at_parsed-at), at, errno);
}
// all bytes in chunk is left now.