From nobody Sat Feb 7 06:39:20 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1620313858; cv=none; d=zohomail.com; s=zohoarc; b=jcqYYs1ohlb1+XGPc1BYT9eXUsIVGeJvLGblDQAG0r4n8VI3DGvgC06Z6gUvu6QNMdOy3JagOo3DVD5N2Ix4nofdqCkkjbq4q8Z34vDSV6P9KgwBaQhIU91Pc6455Bfj1CsFYgCBhOwHqtqDAsXopJl9qifNZSPR/Yg+6kHfx38= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620313858; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=X+STu4Nn0JfYIqJ5SjJVG/CrBjh0Io2WcxloP4WJjS0=; b=doNTvw5CB9ZOAcLyMBVAAKGdZwaM3D7+9yppZxHnel7n2/ll9e+9d+Uo7NRUGfdtl81kHzijnmHm99lcbk/zGvgxphzjpaDzXXKw8R6uiAH2S1mo31gpk1bNPsyw06wRC/gKGLXqLm6QddzL544uYcVBWdkr+Ip74CGzYEFyAN0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1620313858658388.39955887131555; Thu, 6 May 2021 08:10:58 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-556-VbHOXJg2PwOYzP34vkYFvA-1; Thu, 06 May 2021 11:10:54 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 46A77801B12; Thu, 6 May 2021 15:10:49 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 21C3C5D9C0; Thu, 6 May 2021 15:10:49 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id DECC21800B8A; Thu, 6 May 2021 15:10:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 146F8kZc008310 for ; Thu, 6 May 2021 11:08:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 223BB189A5; Thu, 6 May 2021 15:08:46 +0000 (UTC) Received: from work.redhat.com (ovpn-113-21.ams2.redhat.com [10.36.113.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id 69EEE60657; Thu, 6 May 2021 15:08:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620313856; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=X+STu4Nn0JfYIqJ5SjJVG/CrBjh0Io2WcxloP4WJjS0=; b=UaxyDOMH9NMmZ8I9yHBUp9Z6VdWrgDqchO0FtwOHzYFi8DwtTRN/aBMQRxXYvNRSBgHuG5 mTk6iE1momVlnBwXyrOQMFSNh/bnFZcvJf5qS3CqWNKmCRljcaflLCMLTDHuLfRCd0ovGC q5LfLOQI7iYxk+wLxKenPekJtrgEgCY= X-MC-Unique: VbHOXJg2PwOYzP34vkYFvA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 3/7] tests: virfilemock: realpath: Allow non-null second parameter Date: Thu, 6 May 2021 17:08:34 +0200 Message-Id: <20210506150838.30129-4-twiederh@redhat.com> In-Reply-To: <20210506150838.30129-1-twiederh@redhat.com> References: <20210506150838.30129-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" When other preloaded libraries wrap and / or make calls to `realpath` (e.g. LLVM's AddessSanitizer), the second parameter is no longer guaranteed to be NULL. Signed-off-by: Tim Wiederhake --- build-aux/syntax-check.mk | 2 +- tests/virfilemock.c | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 552d639119..03b7599abc 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -1740,7 +1740,7 @@ exclude_file_name_regexp--sc_libvirt_unmarked_diagnos= tics =3D \ exclude_file_name_regexp--sc_po_check =3D ^(docs/|src/rpc/gendispatch\.pl$= $|tests/commandtest.c$$) =20 exclude_file_name_regexp--sc_prohibit_PATH_MAX =3D \ - ^build-aux/syntax-check\.mk$$ + ^(build-aux/syntax-check\.mk|tests/virfilemock.c)$$ =20 exclude_file_name_regexp--sc_prohibit_access_xok =3D \ ^(src/util/virutil\.c)$$ diff --git a/tests/virfilemock.c b/tests/virfilemock.c index 7c9174bdd9..bf153ab769 100644 --- a/tests/virfilemock.c +++ b/tests/virfilemock.c @@ -24,7 +24,6 @@ #if WITH_LINUX_MAGIC_H # include #endif -#include =20 #include "virmock.h" #include "virstring.h" @@ -186,15 +185,20 @@ realpath(const char *path, char *resolved) =20 if (getenv("LIBVIRT_MTAB")) { const char *p; - char *ret; =20 - assert(resolved =3D=3D NULL); - if ((p =3D STRSKIP(path, "/some/symlink"))) - ret =3D g_strdup_printf("/gluster%s", p); - else - ret =3D g_strdup(path); + if ((p =3D STRSKIP(path, "/some/symlink"))) { + if (resolved) + g_snprintf(resolved, PATH_MAX, "/gluster%s", p); + else + resolved =3D g_strdup_printf("/gluster%s", p); + } else { + if (resolved) + g_strlcpy(resolved, path, PATH_MAX); + else + resolved =3D g_strdup(path); + } =20 - return ret; + return resolved; } =20 return real_realpath(path, resolved); --=20 2.26.3