From patchwork Mon Sep 16 12:22:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 1975 Return-Path: Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 225DE60BE6 for ; Mon, 16 Sep 2019 14:21:10 +0200 (CEST) Received: from uno.lan (bl10-204-24.dsl.telepac.pt [85.243.204.24]) (Authenticated sender: jacopo@jmondi.org) by relay10.mail.gandi.net (Postfix) with ESMTPSA id 5EBFA240013; Mon, 16 Sep 2019 12:21:09 +0000 (UTC) From: Jacopo Mondi To: libcamera-devel@lists.libcamera.org Date: Mon, 16 Sep 2019 14:22:38 +0200 Message-Id: <20190916122238.10095-1-jacopo@jmondi.org> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] test: buffer_import: Initialize media_ and video_ X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Sep 2019 12:21:10 -0000 When the vivid module used to test buffer importing is not loaded, the test correctly bails out, but during the clean up procedure tries to access media_ and video_ fields, which, if not correctly initialized to nullptr might retain random values and cause a segfault. Fix this by initializing media_ and video_ to nullptr to make sure they get ignored when cleaup() is called before they get initialized. Fixes: e1a5873701a9 ("test: camera: Add buffer import and mapping test") Signed-off-by: Jacopo Mondi Reviewed-by: Laurent Pinchart --- test/camera/buffer_import.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/camera/buffer_import.cpp b/test/camera/buffer_import.cpp index 9364e3d1bc44..31af8336dc8a 100644 --- a/test/camera/buffer_import.cpp +++ b/test/camera/buffer_import.cpp @@ -28,6 +28,11 @@ static constexpr unsigned int CAMERA_BUFFER_COUNT = 4; class FrameSink { public: + FrameSink() + : media_(nullptr), video_(nullptr) + { + } + int init() { int ret;