From: Tim Kourt <tim.a.kourt@linux.intel.com>
To: iwd@lists.01.org
Subject: [PATCH 7/8] client: Check family name before comparison
Date: Wed, 23 Oct 2019 13:24:02 -0700 [thread overview]
Message-ID: <20191023202403.9690-7-tim.a.kourt@linux.intel.com> (raw)
In-Reply-To: <20191023202403.9690-1-tim.a.kourt@linux.intel.com>
[-- Attachment #1: Type: text/plain, Size: 1155 bytes --]
---
client/display.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/client/display.c b/client/display.c
index 0faa0840..b22b6e90 100644
--- a/client/display.c
+++ b/client/display.c
@@ -180,7 +180,8 @@ void display_refresh_set_cmd(const char *family, const char *entity,
return;
}
- if (display_refresh.family && !strcmp(display_refresh.family, family)) {
+ if (display_refresh.family && family &&
+ !strcmp(display_refresh.family, family)) {
struct l_string *buf = l_string_new(128);
L_AUTO_FREE_VAR(char *, args);
char *prompt;
@@ -205,10 +206,10 @@ void display_refresh_set_cmd(const char *family, const char *entity,
args = l_string_unwrap(buf);
- prompt = l_strdup_printf(IWD_PROMPT"%s%s%s %s %s\n",
- family ? : "",
- entity ? " " : "", entity ? : "",
- cmd->cmd ? : "", args ? : "");
+ prompt = l_strdup_printf(IWD_PROMPT"%s%s%s %s %s\n", family,
+ entity ? " " : "",
+ entity ? : "",
+ cmd->cmd ? : "", args ? : "");
l_queue_push_tail(display_refresh.redo_entries, prompt);
display_refresh.undo_lines++;
--
2.13.6
next prev parent reply other threads:[~2019-10-23 20:24 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-23 20:23 [PATCH 1/8] client: Treat invalid DBus reply same as an error Tim Kourt
2019-10-23 20:23 ` [PATCH 2/8] client: Ignore invalid notifications Tim Kourt
2019-10-23 20:23 ` [PATCH 3/8] client: Ignore invalid agent requests Tim Kourt
2019-10-23 22:51 ` Denis Kenzior
2019-10-23 20:23 ` [PATCH 4/8] hotspot: Fix mem leak on failed hotspot config Tim Kourt
2019-10-23 22:56 ` Denis Kenzior
2019-10-23 20:24 ` [PATCH 5/8] hotspot Eliminate double assignment of variable Tim Kourt
2019-10-23 23:00 ` Denis Kenzior
2019-10-23 20:24 ` [PATCH 6/8] hwsim: Fix potential memory leak Tim Kourt
2019-10-23 20:24 ` Tim Kourt [this message]
2019-10-23 20:24 ` [PATCH 8/8] ofono: Validate message parsing Tim Kourt
2019-10-23 22:50 ` [PATCH 1/8] client: Treat invalid DBus reply same as an error Denis Kenzior
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=20191023202403.9690-7-tim.a.kourt@linux.intel.com \
--to=tim.a.kourt@linux.intel.com \
--cc=iwd@lists.01.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