From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH 1/9] libxl: fix libxl__abs_path Date: Fri, 10 Jul 2015 19:00:49 +0100 Message-ID: <1436551257-28887-2-git-send-email-wei.liu2@citrix.com> References: <1436551257-28887-1-git-send-email-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZDcbf-0002FH-44 for xen-devel@lists.xenproject.org; Fri, 10 Jul 2015 18:01:03 +0000 In-Reply-To: <1436551257-28887-1-git-send-email-wei.liu2@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Xen-devel Cc: Andrew Cooper , Ian Jackson , Ian Campbell , Wei Liu List-Id: xen-devel@lists.xenproject.org If s is NULL, just return NULL to avoid libxl__strdup dereferencing NULL pointer. Signed-off-by: Wei Liu --- tools/libxl/libxl_internal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index 42d548e..6402c1b 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -233,8 +233,8 @@ void libxl__log(libxl_ctx *ctx, xentoollog_level msglevel, int errnoval, char *libxl__abs_path(libxl__gc *gc, const char *s, const char *path) { - if (!s || s[0] == '/') - return libxl__strdup(gc, s); + if (!s) return NULL; + if (s[0] == '/') return libxl__strdup(gc, s); return libxl__sprintf(gc, "%s/%s", path, s); } -- 1.9.1