sven
/
can-utils
mirror of https://github.com/linux-can/can-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #370 from weichslgartner/master 

fix for issue #369
pull/374/head
Marc Kleine-Budde 2022-07-04 14:43:57 +02:00 committed by GitHub
parent cfe13a4c7d da0326ffc6
commit cad1cecf1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib.c
View File

@ -572,13 +572,13 @@ static int snprintf_error_data(char *buf, size_t len, uint8_t err,
if (count){ if (count){
/* Fix for potential buffer overflow https://lgtm.com/rules/1505913226124/ */ /* Fix for potential buffer overflow https://lgtm.com/rules/1505913226124/ */
tmp_n = snprintf(buf + n, len - n, ","); tmp_n = snprintf(buf + n, len - n, ",");
if (tmp_n < 0 || tmp_n >= len - n){ if (tmp_n < 0 || (size_t)tmp_n >= len - n){
return n; return n;
} }
n += tmp_n; n += tmp_n;
} }
tmp_n = snprintf(buf + n, len - n, "%s", arr[i]); tmp_n = snprintf(buf + n, len - n, "%s", arr[i]);
if (tmp_n < 0 || tmp_n >= len - n){ if (tmp_n < 0 || (size_t)tmp_n >= len - n){
return n; return n;
} }
n += tmp_n; n += tmp_n;
@ -658,13 +658,13 @@ void snprintf_can_error_frame(char *buf, size_t len, const struct canfd_frame *c
if (classes){ if (classes){
/* Fix for potential buffer overflow https://lgtm.com/rules/1505913226124/ */ /* Fix for potential buffer overflow https://lgtm.com/rules/1505913226124/ */
tmp_n = snprintf(buf + n, len - n, "%s", sep); tmp_n = snprintf(buf + n, len - n, "%s", sep);
if (tmp_n < 0 || tmp_n >= len - n){ if (tmp_n < 0 || (size_t)tmp_n >= len - n){
return; return;
} }
n += tmp_n; n += tmp_n;
} }
tmp_n = snprintf(buf + n, len - n, "%s", error_classes[i]); tmp_n = snprintf(buf + n, len - n, "%s", error_classes[i]);
if (tmp_n < 0 || tmp_n >= len - n){ if (tmp_n < 0 || (size_t)tmp_n >= len - n){
return; return;
} }
n += tmp_n; n += tmp_n;