From: Tyler Retzlaff <roretzla@linux.microsoft.com>
To: dev@dpdk.org
Cc: ciara.power@intel.com, bruce.richardson@intel.com,
david.marchand@redhat.com, thomas@monjalon.net,
Tyler Retzlaff <roretzla@linux.microsoft.com>
Subject: [PATCH 1/2] telemetry: use malloc instead of variable length array
Date: Mon, 3 Apr 2023 09:30:23 -0700 [thread overview]
Message-ID: <1680539424-20255-2-git-send-email-roretzla@linux.microsoft.com> (raw)
In-Reply-To: <1680539424-20255-1-git-send-email-roretzla@linux.microsoft.com>
Replace use of variable length array optional standard feature to
improve portability.
Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
lib/telemetry/telemetry_json.h | 32 +++++++++++++++++++++++---------
1 file changed, 23 insertions(+), 9 deletions(-)
diff --git a/lib/telemetry/telemetry_json.h b/lib/telemetry/telemetry_json.h
index 744bbfe..c375e97 100644
--- a/lib/telemetry/telemetry_json.h
+++ b/lib/telemetry/telemetry_json.h
@@ -30,18 +30,23 @@
static inline int
__json_snprintf(char *buf, const int len, const char *format, ...)
{
- char tmp[len];
+ char *tmp = malloc(len);
va_list ap;
- int ret;
+ int ret = 0;
+
+ if (tmp == NULL)
+ return ret;
va_start(ap, format);
ret = vsnprintf(tmp, sizeof(tmp), format, ap);
va_end(ap);
if (ret > 0 && ret < (int)sizeof(tmp) && ret < len) {
strcpy(buf, tmp);
- return ret;
}
- return 0; /* nothing written or modified */
+
+ free(tmp);
+
+ return ret;
}
static const char control_chars[0x20] = {
@@ -60,13 +65,17 @@
static inline int
__json_format_str(char *buf, const int len, const char *prefix, const char *str, const char *suffix)
{
- char tmp[len];
int tmpidx = 0;
+ int ret = 0;
+ char *tmp = malloc(len);
+
+ if (tmp == NULL)
+ return ret;
while (*prefix != '\0' && tmpidx < len)
tmp[tmpidx++] = *prefix++;
if (tmpidx >= len)
- return 0;
+ goto cleanup;
while (*str != '\0') {
if (*str < (int)RTE_DIM(control_chars)) {
@@ -85,19 +94,24 @@
* escaped character like "\n" without overflowing
*/
if (tmpidx > len - 2)
- return 0;
+ goto cleanup;
str++;
}
while (*suffix != '\0' && tmpidx < len)
tmp[tmpidx++] = *suffix++;
if (tmpidx >= len)
- return 0;
+ goto cleanup;
tmp[tmpidx] = '\0';
strcpy(buf, tmp);
- return tmpidx;
+ ret = tmpidx;
+
+cleanup:
+ free(tmp);
+
+ return ret;
}
/* Copies an empty array into the provided buffer. */
--
1.8.3.1
next prev parent reply other threads:[~2023-04-03 16:30 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-03 16:30 [PATCH 0/2] improve code portability Tyler Retzlaff
2023-04-03 16:30 ` Tyler Retzlaff [this message]
2023-04-03 17:17 ` [PATCH 1/2] telemetry: use malloc instead of variable length array Tyler Retzlaff
2023-04-03 20:19 ` Stephen Hemminger
2023-04-03 20:40 ` Tyler Retzlaff
2023-04-04 8:47 ` Bruce Richardson
2023-04-04 16:24 ` Tyler Retzlaff
2023-04-04 16:28 ` Bruce Richardson
2023-04-04 16:44 ` Tyler Retzlaff
2023-04-04 17:25 ` Bruce Richardson
2023-04-04 17:34 ` Tyler Retzlaff
2023-04-05 1:20 ` Stephen Hemminger
2023-04-05 8:53 ` Bruce Richardson
2023-04-05 1:04 ` Stephen Hemminger
2023-04-05 8:54 ` Bruce Richardson
2023-04-05 15:25 ` Tyler Retzlaff
2023-04-05 15:30 ` Dmitry Kozlyuk
2023-04-05 15:37 ` Stephen Hemminger
2023-04-05 15:47 ` Bruce Richardson
2023-04-03 16:30 ` [PATCH 2/2] telemetry: use portable syntax to initialize array Tyler Retzlaff
2023-04-03 17:04 ` [PATCH 0/2] improve code portability Bruce Richardson
2023-04-03 17:35 ` Tyler Retzlaff
2023-04-03 18:47 ` [PATCH v2] " Tyler Retzlaff
2023-04-03 18:47 ` [PATCH v2] telemetry: use portable syntax to initialize array Tyler Retzlaff
2023-04-03 18:59 ` [PATCH v3] improve code portability Tyler Retzlaff
2023-04-03 18:59 ` [PATCH v3] telemetry: use portable syntax to initialize array Tyler Retzlaff
2023-04-04 8:51 ` Bruce Richardson
2023-04-04 15:54 ` Tyler Retzlaff
2023-04-04 16:08 ` Bruce Richardson
2023-04-04 9:01 ` Konstantin Ananyev
2023-04-04 15:59 ` Tyler Retzlaff
2023-04-04 16:19 ` Bruce Richardson
2023-04-04 16:28 ` Tyler Retzlaff
2023-04-04 18:09 ` [PATCH v4] improve code portability Tyler Retzlaff
2023-04-04 18:09 ` [PATCH v4] telemetry: remove non-portable array initialization syntax Tyler Retzlaff
2023-04-05 8:56 ` Bruce Richardson
2023-04-05 15:27 ` Tyler Retzlaff
2023-04-05 18:52 ` [PATCH v5] improve code portability Tyler Retzlaff
2023-04-05 18:52 ` [PATCH v5] telemetry: remove non-portable array initialization syntax Tyler Retzlaff
2023-05-24 20:54 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1680539424-20255-2-git-send-email-roretzla@linux.microsoft.com \
--to=roretzla@linux.microsoft.com \
--cc=bruce.richardson@intel.com \
--cc=ciara.power@intel.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).