Skip to content
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

Fix: no newline when debug msg over DEBUG_BUF_SIZE #7607

Merged
merged 8 commits into from
May 17, 2023
Merged

Fix: no newline when debug msg over DEBUG_BUF_SIZE #7607

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
25418ac
Fix: no newline when debug msg over DEBUG_BUF_SIZE
valord577 Oct 31, 2022
9ecf5f9
Update library/debug.c
daverodgman Oct 31, 2022
24da0cd
send debug msg if contains '\n'
valord577 Feb 15, 2023
536893c
make code readable and change var name
valord577 Feb 15, 2023
176e927
code style
valord577 Feb 15, 2023
5bfcd1c
simplify code
valord577 Feb 15, 2023
ed59ea7
Document minimum size for DEBUG_BUF_SIZE
daverodgman Feb 15, 2023
8508e50
Make use of MBEDTLS_STATIC_ASSERT
daverodgman May 16, 2023
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
14 changes: 11 additions & 3 deletions library/debug.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include <stdio.h>
#include <string.h>

/* DEBUG_BUF_SIZE must be at least 2 */
#define DEBUG_BUF_SIZE 512

static int debug_threshold = 0;
Expand Down Expand Up @@ -69,6 +70,8 @@ void mbedtls_debug_print_msg(const mbedtls_ssl_context *ssl, int level,
char str[DEBUG_BUF_SIZE];
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;

MBEDTLS_STATIC_ASSERT(DEBUG_BUF_SIZE >= 2, "DEBUG_BUF_SIZE too small");

if (NULL == ssl ||
NULL == ssl->conf ||
NULL == ssl->conf->f_dbg ||
Expand All @@ -80,10 +83,15 @@ void mbedtls_debug_print_msg(const mbedtls_ssl_context *ssl, int level,
ret = mbedtls_vsnprintf(str, DEBUG_BUF_SIZE, format, argp);
va_end(argp);

if (ret >= 0 && ret < DEBUG_BUF_SIZE - 1) {
str[ret] = '\n';
str[ret + 1] = '\0';
if (ret < 0) {
ret = 0;
} else {
if (ret >= DEBUG_BUF_SIZE - 1) {
ret = DEBUG_BUF_SIZE - 2;
}
}
str[ret] = '\n';
str[ret + 1] = '\0';

debug_send_line(ssl, level, file, line, str);
}
Expand Down