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

Fix the snprintf size issue.

Browse source
This commit is contained in:
winlin 2022-08-10 08:32:02 +08:00
parent 1ab584b2ae
commit a71eddd56a
10 changed files with 46 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
trunk/src/app/srs_app_latest_version.cpp
View file

@ -178,11 +178,15 @@ srs_error_t SrsLatestVersion::start()
uuid_t uuid; uuid_t uuid;
uuid_generate_time(uuid); uuid_generate_time(uuid);
char buf[32]; // Must reserve last 1 byte for the trailing '\0', because we expect the size of uuid string is 32 bytes.
char buf[32 + 1];
srs_assert(16 == sizeof(uuid_t));
for (int i = 0; i < 16; i++) { for (int i = 0; i < 16; i++) {
snprintf(buf + i * 2, sizeof(buf), "%02x", uuid[i]); int r0 = snprintf(buf + i * 2, sizeof(buf) - i * 2, "%02x", uuid[i]);
srs_assert(r0 > 0 && r0 < sizeof(buf) - i * 2);
} }
server_id_ = string(buf, sizeof(buf)); server_id_ = buf;
} }
return trd_->start(); return trd_->start();

7
trunk/src/app/srs_app_listener.cpp
View file

@ -433,9 +433,12 @@ std::string SrsUdpMuxSocket::peer_id()
peer_port = atoi(port_string); peer_port = atoi(port_string);
} }
// Build the peer id. // Build the peer id, reserve 1 byte for the trailing '\0'.
static char id_buf[128]; static char id_buf[128 + 1];
int len = snprintf(id_buf, sizeof(id_buf), "%s:%d", peer_ip.c_str(), peer_port); int len = snprintf(id_buf, sizeof(id_buf), "%s:%d", peer_ip.c_str(), peer_port);
if (len <= 0 || len >= sizeof(id_buf)) {
return "";
}
peer_id_ = string(id_buf, len); peer_id_ = string(id_buf, len);
// Update the stat. // Update the stat.

2
trunk/src/app/srs_app_utility.cpp
View file

@ -1386,7 +1386,7 @@ string srs_string_dumps_hex(const char* str, int length, int limit, char seperat
int len = 0; int len = 0;
for (int i = 0; i < length && i < limit && len < LIMIT; ++i) { for (int i = 0; i < length && i < limit && len < LIMIT; ++i) {
int nb = snprintf(buf + len, LIMIT - len, "%02x", (uint8_t)str[i]); int nb = snprintf(buf + len, LIMIT - len, "%02x", (uint8_t)str[i]);
if (nb < 0 || nb >= LIMIT - len) { if (nb <= 0 || nb >= LIMIT - len) {
break; break;
} }
len += nb; len += nb;

8
trunk/src/kernel/srs_kernel_utility.cpp
View file

@ -276,16 +276,16 @@ bool srs_check_ip_addr_valid(string ip)
string srs_int2str(int64_t value) string srs_int2str(int64_t value)
{ {
// len(max int64_t) is 20, plus one "+-." // len(max int64_t) is 20, plus one "+-."
char tmp[22]; char tmp[21 + 1];
snprintf(tmp, 22, "%" PRId64, value); snprintf(tmp, sizeof(tmp), "%" PRId64, value);
return tmp; return tmp;
} }
string srs_float2str(double value) string srs_float2str(double value)
{ {
// len(max int64_t) is 20, plus one "+-." // len(max int64_t) is 20, plus one "+-."
char tmp[22]; char tmp[21 + 1];
snprintf(tmp, 22, "%.2f", value); snprintf(tmp, sizeof(tmp), "%.2f", value);
return tmp; return tmp;
} }

6
trunk/src/protocol/srs_protocol_http_conn.cpp
View file

@ -773,6 +773,9 @@ srs_error_t SrsHttpResponseWriter::write(char* data, int size)
// send in chunked encoding. // send in chunked encoding.
int nb_size = snprintf(header_cache, SRS_HTTP_HEADER_CACHE_SIZE, "%x", size); int nb_size = snprintf(header_cache, SRS_HTTP_HEADER_CACHE_SIZE, "%x", size);
if (nb_size <= 0 || nb_size >= SRS_HTTP_HEADER_CACHE_SIZE) {
return srs_error_new(ERROR_HTTP_CONTENT_LENGTH, "overflow size=%d, expect=%d", size, nb_size);
}
iovec iovs[4]; iovec iovs[4];
iovs[0].iov_base = (char*)header_cache; iovs[0].iov_base = (char*)header_cache;
@ -842,6 +845,9 @@ srs_error_t SrsHttpResponseWriter::writev(const iovec* iov, int iovcnt, ssize_t*
// chunk header // chunk header
int nb_size = snprintf(header_cache, SRS_HTTP_HEADER_CACHE_SIZE, "%x", size); int nb_size = snprintf(header_cache, SRS_HTTP_HEADER_CACHE_SIZE, "%x", size);
if (nb_size <= 0 || nb_size >= SRS_HTTP_HEADER_CACHE_SIZE) {
return srs_error_new(ERROR_HTTP_CONTENT_LENGTH, "overflow size=%d, expect=%d", size, nb_size);
}
iovss[0].iov_base = (char*)header_cache; iovss[0].iov_base = (char*)header_cache;
iovss[0].iov_len = (int)nb_size; iovss[0].iov_len = (int)nb_size;

4
trunk/src/protocol/srs_protocol_json.cpp
View file

@ -1582,8 +1582,8 @@ string SrsJsonAny::dumps()
} }
case SRS_JSON_Number: { case SRS_JSON_Number: {
// len(max int64_t) is 20, plus one "+-." // len(max int64_t) is 20, plus one "+-."
char tmp[22]; char tmp[21 + 1];
snprintf(tmp, 22, "%.2f", to_number()); snprintf(tmp, sizeof(tmp), "%.2f", to_number());
return tmp; return tmp;
} }
case SRS_JSON_Null: { case SRS_JSON_Null: {

2
trunk/src/protocol/srs_protocol_rtmp_handshake.cpp
View file

@ -962,7 +962,7 @@ namespace srs_internal
srs_random_generate(random, 1504); srs_random_generate(random, 1504);
int size = snprintf(random, 1504, "%s", RTMP_SIG_SRS_HANDSHAKE); int size = snprintf(random, 1504, "%s", RTMP_SIG_SRS_HANDSHAKE);
srs_assert(size < 1504); srs_assert(size > 0 && size < 1504);
snprintf(random + 1504 - size, size, "%s", RTMP_SIG_SRS_HANDSHAKE); snprintf(random + 1504 - size, size, "%s", RTMP_SIG_SRS_HANDSHAKE);
srs_random_generate(digest, 32); srs_random_generate(digest, 32);

3
trunk/src/protocol/srs_protocol_srt.cpp
View file

@ -170,7 +170,8 @@ srs_error_t srs_srt_listen(srs_srt_t srt_fd, std::string ip, int port)
srs_error_t err = srs_success; srs_error_t err = srs_success;
char sport[8]; char sport[8];
snprintf(sport, sizeof(sport), "%d", port); int r0 = snprintf(sport, sizeof(sport), "%d", port);
srs_assert(r0 > 0 && r0 < sizeof(sport));
addrinfo hints; addrinfo hints;
memset(&hints, 0, sizeof(hints)); memset(&hints, 0, sizeof(hints));

9
trunk/src/protocol/srs_protocol_st.cpp
View file

@ -175,7 +175,8 @@ srs_error_t srs_tcp_connect(string server, int port, srs_utime_t tm, srs_netfd_t
srs_netfd_t stfd = NULL; srs_netfd_t stfd = NULL;
char sport[8]; char sport[8];
snprintf(sport, sizeof(sport), "%d", port); int r0 = snprintf(sport, sizeof(sport), "%d", port);
srs_assert(r0 > 0 && r0 < sizeof(sport));
addrinfo hints; addrinfo hints;
memset(&hints, 0, sizeof(hints)); memset(&hints, 0, sizeof(hints));
@ -251,7 +252,8 @@ srs_error_t srs_tcp_listen(std::string ip, int port, srs_netfd_t* pfd)
srs_error_t err = srs_success; srs_error_t err = srs_success;
char sport[8]; char sport[8];
snprintf(sport, sizeof(sport), "%d", port); int r0 = snprintf(sport, sizeof(sport), "%d", port);
srs_assert(r0 > 0 && r0 < sizeof(sport));
addrinfo hints; addrinfo hints;
memset(&hints, 0, sizeof(hints)); memset(&hints, 0, sizeof(hints));
@ -312,7 +314,8 @@ srs_error_t srs_udp_listen(std::string ip, int port, srs_netfd_t* pfd)
srs_error_t err = srs_success; srs_error_t err = srs_success;
char sport[8]; char sport[8];
snprintf(sport, sizeof(sport), "%d", port); int r0 = snprintf(sport, sizeof(sport), "%d", port);
srs_assert(r0 > 0 && r0 < sizeof(sport));
addrinfo hints; addrinfo hints;
memset(&hints, 0, sizeof(hints)); memset(&hints, 0, sizeof(hints));

12
trunk/src/utest/srs_utest_core.cpp
View file

@ -72,5 +72,17 @@ VOID TEST(CoreLogger, CheckVsnprintf)
EXPECT_EQ(0, buf[2]); EXPECT_EQ(0, buf[2]);
EXPECT_EQ(0xf, buf[3]); EXPECT_EQ(0xf, buf[3]);
} }
if (true) {
char buf[5];
EXPECT_EQ(4, snprintf(buf, sizeof(buf), "Hell"));
EXPECT_STREQ("Hell", buf);
EXPECT_EQ(5, snprintf(buf, sizeof(buf), "Hello"));
EXPECT_STREQ("Hell", buf);
EXPECT_EQ(10, snprintf(buf, sizeof(buf), "HelloWorld"));
EXPECT_STREQ("Hell", buf);
}
} }