From e727d6f8385b2ab8c40915cb433531067f9532c5 Mon Sep 17 00:00:00 2001
From: Martin Mathieson <martin.mathieson@keysight.com>
Date: Sun, 14 Feb 2021 15:00:19 +0000
Subject: [PATCH] PDCP: set key error strings with g_strdup_print)

---
 epan/dissectors/packet-pdcp-lte.c | 16 +++++-----------
 epan/dissectors/packet-pdcp-nr.c  | 16 +++++-----------
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c
index 87459c77e0..ede84b15ef 100644
--- a/epan/dissectors/packet-pdcp-lte.c
+++ b/epan/dissectors/packet-pdcp-lte.c
@@ -215,14 +215,11 @@ static gboolean check_valid_key_string(const char* raw_string, char* checked_str
     guint written = 0;
     guint length = (gint)strlen(raw_string);
 
-    char error_str[256];
-
     /* Can't be valid if not long enough. */
     if (length < 32) {
         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",
-                       raw_string, length);
-            *error = g_strdup(error_str);
+            *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);
         }
 
         return FALSE;
@@ -243,21 +240,18 @@ static gboolean check_valid_key_string(const char* raw_string, char* checked_str
             checked_string[written++] = c;
         }
         else {
-            g_snprintf(error_str, 256, "PDCP-LTE: Invalid char '%c' given in key", c);
-            *error = g_strdup(error_str);
+            *error = g_strdup_printf("PDCP-LTE: Invalid char '%c' given in key", c);
             return FALSE;
         }
     }
 
     /* Must have found exactly 32 hex ascii chars for 16-byte key */
     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(error_str);
+        *error = g_strdup_printf("PDCP-LTE: Key (%s) should contain 32 hex characters (16 bytes) but more detected", raw_string);
         return FALSE;
     }
     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(error_str);
+        *error = g_strdup_printf("PDCP-LTE: Key (%s) should contain 32 hex characters (16 bytes) but %u detected", raw_string, written);
         return FALSE;
     }
     else {
diff --git a/epan/dissectors/packet-pdcp-nr.c b/epan/dissectors/packet-pdcp-nr.c
index 06caf0dba8..e5ef472652 100644
--- a/epan/dissectors/packet-pdcp-nr.c
+++ b/epan/dissectors/packet-pdcp-nr.c
@@ -193,14 +193,11 @@ static gboolean check_valid_key_string(const char* raw_string, char* checked_str
     guint written = 0;
     guint length = (gint)strlen(raw_string);
 
-    char error_str[256];
-
     /* Can't be valid if not long enough. */
     if (length < 32) {
         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",
-                       raw_string, length);
-            *error = g_strdup(error_str);
+            *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);
         }
         return FALSE;
     }
@@ -220,21 +217,18 @@ static gboolean check_valid_key_string(const char* raw_string, char* checked_str
             checked_string[written++] = c;
         }
         else {
-            g_snprintf(error_str, 256, "PDCP-NR: Invalid char '%c' given in key", c);
-            *error = g_strdup(error_str);
+            *error = g_strdup_printf("PDCP-NR: Invalid char '%c' given in key", c);
             return FALSE;
         }
     }
 
     /* Must have found exactly 32 hex ascii chars for 16-byte key */
     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(error_str);
+        *error = g_strdup_printf("PDCP-NR: Key (%s) should contain 32 hex characters (16 bytes) but more detected", raw_string);
         return FALSE;
     }
     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(error_str);
+        *error = g_strdup_printf("PDCP-NR: Key (%s) should contain 32 hex characters (16 bytes) but %u detected", raw_string, written);
         return FALSE;
     }
     else {