From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: xen-devel@lists.xenproject.org, ian.campbell@citrix.com,
wei.liu2@citrix.com, ian.jackson@eu.citrix.com
Cc: Yang Hongyang <hongyang.yang@easystack.cn>,
Wen Congyang <wency@cn.fujitsu.com>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Subject: [PATCH 2/3] libxl/remus: Move the assert before the info is used.
Date: Mon, 25 Jan 2016 16:06:56 -0500 [thread overview]
Message-ID: <1453756017-8747-3-git-send-email-konrad.wilk@oracle.com> (raw)
In-Reply-To: <1453756017-8747-1-git-send-email-konrad.wilk@oracle.com>
The assert(info) is after quite a lot of manipulations
on 'info' - which makes the assert pointless because if
info was NULL it would have crashed earlier.
Move it earlier so that it guards before we try using
the 'info' structure.
CC: Wen Congyang <wency@cn.fujitsu.com>
CC: Yang Hongyang <hongyang.yang@easystack.cn>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
tools/libxl/libxl.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index 2bde0f5..60974cc 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -855,6 +855,8 @@ int libxl_domain_remus_start(libxl_ctx *ctx, libxl_domain_remus_info *info,
goto out;
}
+ assert(info);
+
libxl_defbool_setdefault(&info->allow_unsafe, false);
libxl_defbool_setdefault(&info->blackhole, false);
libxl_defbool_setdefault(&info->compression, true);
@@ -883,8 +885,6 @@ int libxl_domain_remus_start(libxl_ctx *ctx, libxl_domain_remus_info *info,
dss->debug = 0;
dss->remus = info;
- assert(info);
-
/* Point of no return */
libxl__remus_setup(egc, dss);
return AO_INPROGRESS;
--
2.4.3
next prev parent reply other threads:[~2016-01-25 21:07 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-26 21:30 [PATCH] various updates/fixes. (v2) Konrad Rzeszutek Wilk
2016-01-26 21:30 ` [PATCH 1/4] libxl: Use libxl_strdup instead of strdup on libxl_version_info Konrad Rzeszutek Wilk
2016-02-01 12:13 ` Wei Liu
2016-02-03 11:46 ` Ian Campbell
2016-01-26 21:30 ` [PATCH 2/4] libxc/xc_domain_resume: Update comment Konrad Rzeszutek Wilk
2016-02-01 12:14 ` Wei Liu
2016-02-03 11:47 ` Ian Campbell
2016-01-26 21:30 ` [PATCH 3/4] libxl/remus: Change the assert for info to an return Konrad Rzeszutek Wilk
2016-02-01 12:13 ` Wei Liu
2016-01-25 21:06 ` [PATCH] toolstack documentation/asserts cleanups. (v1) Konrad Rzeszutek Wilk
2016-01-25 21:06 ` [PATCH 1/3] libxc/xc_domain_resume: Update comment Konrad Rzeszutek Wilk
2016-01-26 16:19 ` Ian Campbell
2016-01-26 16:22 ` Ian Jackson
2016-01-26 16:36 ` Ian Campbell
2016-01-26 16:52 ` Ian Jackson
2016-01-26 19:37 ` Konrad Rzeszutek Wilk
2016-01-26 19:47 ` Konrad Rzeszutek Wilk
2016-01-27 9:52 ` Ian Campbell
2016-01-25 21:06 ` Konrad Rzeszutek Wilk [this message]
2016-01-26 16:21 ` [PATCH 2/3] libxl/remus: Move the assert before the info is used Ian Campbell
2016-01-26 16:23 ` Ian Jackson
2016-02-01 14:14 ` [PATCH 2/3] libxl/remus: Move the assert before the info is used. [and 1 more messages] Ian Jackson
2016-01-25 21:06 ` [PATCH 3/3] tools/libxl: run_helper - add #define for arguments Konrad Rzeszutek Wilk
2016-01-26 16:23 ` Ian Campbell
2016-01-26 16:25 ` Ian Jackson
2016-02-03 11:48 ` Ian Campbell
2016-01-26 21:31 ` [PATCH 4/4] " Konrad Rzeszutek Wilk
2016-02-03 11:47 ` Ian Campbell
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=1453756017-8747-3-git-send-email-konrad.wilk@oracle.com \
--to=konrad.wilk@oracle.com \
--cc=hongyang.yang@easystack.cn \
--cc=ian.campbell@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=wei.liu2@citrix.com \
--cc=wency@cn.fujitsu.com \
--cc=xen-devel@lists.xenproject.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;
as well as URLs for NNTP newsgroup(s).