osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

PDCP: set key error strings with g_strdup_print)

This commit is contained in:
Martin Mathieson 2021-02-14 15:00:19 +00:00
parent 20bc017ba5
commit e727d6f838
2 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
epan/dissectors/packet-pdcp-lte.c
View File

@ -215,14 +215,11 @@ static gboolean check_valid_key_string(const char* raw_string, char* checked_str
guint written = 0; guint written = 0;
guint length = (gint)strlen(raw_string); guint length = (gint)strlen(raw_string);
char error_str[256];
/* Can't be valid if not long enough. */ /* Can't be valid if not long enough. */
if (length < 32) { if (length < 32) {
if (length > 0) { if (length > 0) {
g_snprintf(error_str, 256, "PDCP LTE: Invalid key string (%s) - should include 32 ASCII hex characters (16 bytes) but only %u chars given", *error = g_strdup_printf("PDCP LTE: Invalid key string (%s) - should include 32 ASCII hex characters (16 bytes) but only %u chars given",
raw_string, length); raw_string, length);
*error = g_strdup(error_str);
} }
return FALSE; return FALSE;
@ -243,21 +240,18 @@ static gboolean check_valid_key_string(const char* raw_string, char* checked_str
checked_string[written++] = c; checked_string[written++] = c;
} }
else { else {
g_snprintf(error_str, 256, "PDCP-LTE: Invalid char '%c' given in key", c); *error = g_strdup_printf("PDCP-LTE: Invalid char '%c' given in key", c);
*error = g_strdup(error_str);
return FALSE; return FALSE;
} }
} }
/* Must have found exactly 32 hex ascii chars for 16-byte key */ /* Must have found exactly 32 hex ascii chars for 16-byte key */
if (n<length) { if (n<length) {
g_snprintf(error_str, 256, "PDCP-LTE: Key (%s) should contain 32 hex characters (16 bytes) but more detected", raw_string); *error = g_strdup_printf("PDCP-LTE: Key (%s) should contain 32 hex characters (16 bytes) but more detected", raw_string);
*error = g_strdup(error_str);
return FALSE; return FALSE;
} }
if (written != 32) { if (written != 32) {
g_snprintf(error_str, 256, "PDCP-LTE: Key (%s) should contain 32 hex characters (16 bytes) but %u detected", raw_string, written); *error = g_strdup_printf("PDCP-LTE: Key (%s) should contain 32 hex characters (16 bytes) but %u detected", raw_string, written);
*error = g_strdup(error_str);
return FALSE; return FALSE;
} }
else { else {

16
epan/dissectors/packet-pdcp-nr.c
View File

@ -193,14 +193,11 @@ static gboolean check_valid_key_string(const char* raw_string, char* checked_str
guint written = 0; guint written = 0;
guint length = (gint)strlen(raw_string); guint length = (gint)strlen(raw_string);
char error_str[256];
/* Can't be valid if not long enough. */ /* Can't be valid if not long enough. */
if (length < 32) { if (length < 32) {
if (length > 0) { if (length > 0) {
g_snprintf(error_str, 256, "PDCP NR: Invalid key string (%s) - should include 32 ASCII hex characters (16 bytes) but only %u chars given", *error = g_strdup_printf("PDCP NR: Invalid key string (%s) - should include 32 ASCII hex characters (16 bytes) but only %u chars given",
raw_string, length); raw_string, length);
*error = g_strdup(error_str);
} }
return FALSE; return FALSE;
} }
@ -220,21 +217,18 @@ static gboolean check_valid_key_string(const char* raw_string, char* checked_str
checked_string[written++] = c; checked_string[written++] = c;
} }
else { else {
g_snprintf(error_str, 256, "PDCP-NR: Invalid char '%c' given in key", c); *error = g_strdup_printf("PDCP-NR: Invalid char '%c' given in key", c);
*error = g_strdup(error_str);
return FALSE; return FALSE;
} }
} }
/* Must have found exactly 32 hex ascii chars for 16-byte key */ /* Must have found exactly 32 hex ascii chars for 16-byte key */
if (n<length) { if (n<length) {
g_snprintf(error_str, 256, "PDCP-NR: Key (%s) should contain 32 hex characters (16 bytes) but more detected", raw_string); *error = g_strdup_printf("PDCP-NR: Key (%s) should contain 32 hex characters (16 bytes) but more detected", raw_string);
*error = g_strdup(error_str);
return FALSE; return FALSE;
} }
if (written != 32) { if (written != 32) {
g_snprintf(error_str, 256, "PDCP-NR: Key (%s) should contain 32 hex characters (16 bytes) but %u detected", raw_string, written); *error = g_strdup_printf("PDCP-NR: Key (%s) should contain 32 hex characters (16 bytes) but %u detected", raw_string, written);
*error = g_strdup(error_str);
return FALSE; return FALSE;
} }
else { else {