Mirrors_Framework/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2026-09-22 03:09:16 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix(at): clamp formatted output length

Browse Source
This commit is contained in:
AFWEF_147
2026-04-01 22:56:37 +08:00
committed by Rbb666
parent 9c8b58f482
commit ebe65849db
1 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/net/at/src/at_utils.c
+31 -4
View File
@@ -63,9 +63,36 @@ rt_weak rt_size_t at_utils_send(rt_device_t dev,
{
return rt_device_write(dev, pos, buffer, size);
}
static rt_size_t _at_vsnprintf_len(char *send_buf, rt_size_t buf_size, rt_size_t suffix_size,
const char *format, va_list args)
{
int len;
rt_size_t text_size;
if (buf_size <= suffix_size)
{
return 0;
}
text_size = buf_size - suffix_size;
len = vsnprintf(send_buf, text_size, format, args);
if (len <= 0)
{
return 0;
}
if ((rt_size_t)len >= text_size)
{
return text_size - 1;
}
return len;
}
rt_size_t at_vprintf(rt_device_t device, char *send_buf, rt_size_t buf_size, const char *format, va_list args)
{
rt_size_t len = vsnprintf(send_buf, buf_size, format, args);
rt_size_t len = _at_vsnprintf_len(send_buf, buf_size, 0, format, args);
if (len == 0)
{
return 0;
@@ -79,7 +106,7 @@ rt_size_t at_vprintf(rt_device_t device, char *send_buf, rt_size_t buf_size, con
}
rt_size_t at_vprintfln(rt_device_t device, char *send_buf, rt_size_t buf_size, const char *format, va_list args)
{
rt_size_t len = vsnprintf(send_buf, buf_size - 2, format, args);
rt_size_t len = _at_vsnprintf_len(send_buf, buf_size, 2, format, args);
if (len == 0)
{
return 0;
@@ -96,7 +123,7 @@ rt_size_t at_vprintfln(rt_device_t device, char *send_buf, rt_size_t buf_size, c
}
rt_size_t at_vprintfcr(rt_device_t device, char *send_buf, rt_size_t buf_size, const char *format, va_list args)
{
rt_size_t len = vsnprintf(send_buf, buf_size - 1, format, args);
rt_size_t len = _at_vsnprintf_len(send_buf, buf_size, 1, format, args);
if (len == 0)
{
return 0;
@@ -112,7 +139,7 @@ rt_size_t at_vprintfcr(rt_device_t device, char *send_buf, rt_size_t buf_size, c
}
rt_size_t at_vprintflf(rt_device_t device, char *send_buf, rt_size_t buf_size, const char *format, va_list args)
{
rt_size_t len = vsnprintf(send_buf, buf_size - 1, format, args);
rt_size_t len = _at_vsnprintf_len(send_buf, buf_size, 1, format, args);
if (len == 0)
{
return 0;