From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH v2 1/2] xfuncs: return NULL from xstrdup_wchar(NULL)
Date: Wed, 17 Jul 2024 09:28:42 +0200 [thread overview]
Message-ID: <20240717072843.2828788-1-a.fatoum@pengutronix.de> (raw)
From: Ahmad Fatoum <ahmad@a3f.at>
strdup_wchar, strdup_char_to_wchar and xstrdup_wchar_to_char all return
NULL when passed a NULL pointer. It's thus misleading for the xfunc
version of them to trigger an enomem_panic in that case.
Fix this by passing along the NULL pointer unchanged.
xstrdup() already behaves exactly this way.
Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
v1 -> v2:
- new patch
---
lib/xfuncs.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/lib/xfuncs.c b/lib/xfuncs.c
index ac67bf4f5584..d4beecddf5aa 100644
--- a/lib/xfuncs.c
+++ b/lib/xfuncs.c
@@ -146,8 +146,12 @@ EXPORT_SYMBOL(xasprintf);
wchar_t *xstrdup_wchar(const wchar_t *s)
{
- wchar_t *p = strdup_wchar(s);
+ wchar_t *p;
+ if (!s)
+ return NULL;
+
+ p = strdup_wchar(s);
if (!p)
enomem_panic((wcslen(s) + 1) * sizeof(wchar_t));
@@ -157,8 +161,12 @@ EXPORT_SYMBOL(xstrdup_wchar);
wchar_t *xstrdup_char_to_wchar(const char *s)
{
- wchar_t *p = strdup_char_to_wchar(s);
+ wchar_t *p;
+ if (!s)
+ return NULL;
+
+ p = strdup_char_to_wchar(s);
if (!p)
enomem_panic((strlen(s) + 1) * sizeof(wchar_t));
@@ -168,8 +176,12 @@ EXPORT_SYMBOL(xstrdup_char_to_wchar);
char *xstrdup_wchar_to_char(const wchar_t *s)
{
- char *p = strdup_wchar_to_char(s);
+ char *p;
+ if (!s)
+ return NULL;
+
+ p = strdup_wchar_to_char(s);
if (!p)
enomem_panic((wcslen(s) + 1) * sizeof(wchar_t));
--
2.39.2
next reply other threads:[~2024-07-17 7:29 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-17 7:28 Ahmad Fatoum [this message]
2024-07-17 7:28 ` [PATCH v2 2/2] include: xfuncs: employ compiler attributes to aid GCC warnings Ahmad Fatoum
2024-07-19 6:40 ` [PATCH v2 1/2] xfuncs: return NULL from xstrdup_wchar(NULL) Sascha Hauer
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=20240717072843.2828788-1-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
/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