From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: sandeen@sandeen.net, darrick.wong@oracle.com
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH 1/3] libxcmd: don't crash if el_gets returns null
Date: Sat, 09 May 2020 09:29:37 -0700 [thread overview]
Message-ID: <158904177769.982835.13533960280738735171.stgit@magnolia> (raw)
In-Reply-To: <158904177147.982835.3876574696663645345.stgit@magnolia>
From: Darrick J. Wong <darrick.wong@oracle.com>
el_gets returns NULL if it fails to read any characters (due to EOF or
errors occurred). strdup will crash if it is fed a NULL string, so
check the return value to avoid segfaulting.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
libxcmd/input.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/libxcmd/input.c b/libxcmd/input.c
index 137856e3..a4548d7c 100644
--- a/libxcmd/input.c
+++ b/libxcmd/input.c
@@ -47,6 +47,7 @@ fetchline(void)
static EditLine *el;
static History *hist;
HistEvent hevent;
+ const char *cmd;
char *line;
int count;
@@ -59,13 +60,18 @@ fetchline(void)
el_set(el, EL_PROMPT, el_get_prompt);
el_set(el, EL_HIST, history, (const char *)hist);
}
- line = strdup(el_gets(el, &count));
- if (line) {
- if (count > 0)
- line[count-1] = '\0';
- if (*line)
- history(hist, &hevent, H_ENTER, line);
- }
+ cmd = el_gets(el, &count);
+ if (!cmd)
+ return NULL;
+
+ line = strdup(cmd);
+ if (!line)
+ return NULL;
+
+ if (count > 0)
+ line[count-1] = '\0';
+ if (*line)
+ history(hist, &hevent, H_ENTER, line);
return line;
}
#else
next prev parent reply other threads:[~2020-05-09 16:29 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-09 16:29 [PATCH 0/3] xfsprogs: random fixes Darrick J. Wong
2020-05-09 16:29 ` Darrick J. Wong [this message]
2020-05-09 16:36 ` [PATCH 1/3] libxcmd: don't crash if el_gets returns null Christoph Hellwig
2020-05-09 16:29 ` [PATCH 2/3] find_api_violations: fix sed expression Darrick J. Wong
2020-05-09 16:36 ` Christoph Hellwig
2020-05-09 16:38 ` Darrick J. Wong
2020-05-09 16:44 ` Christoph Hellwig
2020-05-09 17:10 ` Eric Sandeen
2020-05-09 16:29 ` [PATCH 3/3] xfs_db: bounds-check access to the dbmap array Darrick J. Wong
2020-05-09 16:37 ` Christoph Hellwig
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=158904177769.982835.13533960280738735171.stgit@magnolia \
--to=darrick.wong@oracle.com \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@sandeen.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.