From patchwork Tue Apr 14 07:06:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 3458 X-Patchwork-Delegate: umang.jain@ideasonboard.com Return-Path: Received: from o1.f.az.sendgrid.net (o1.f.az.sendgrid.net [208.117.55.132]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3263B62E31 for ; Tue, 14 Apr 2020 09:07:00 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=uajain.com header.i=@uajain.com header.b="kvWdn3qF"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=uajain.com; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type; s=s1; bh=fNnGy3RvRFDdZhehFp4tLjtkmJxZA9e4wg6lLnfB9do=; b=kvWdn3qFcvEv8CnZ6cKExWEwaxg6bbcWnxhYkZDociL+MDtFLoTlgQrrCxo6PnzooZUr 7+gthZKrJchIXMUBxMZO84tXEimbu0MS+HhhjeVfGM7t/L2/RHjEF5TC74VFHhFo9fMPUn r33GjIS5+9Vqr5WhyGBAI7xSHxioqbZMQ= Received: by filter0084p3las1.sendgrid.net with SMTP id filter0084p3las1-28345-5E956112-A5 2020-04-14 07:06:58.689315235 +0000 UTC m=+1071357.482902598 Received: from mail.uajain.com (unknown) by ismtpd0005p1hnd1.sendgrid.net (SG) with ESMTP id 8C40N9AZQTGMs5WmDfmuYA Tue, 14 Apr 2020 07:06:58.233 +0000 (UTC) From: Umang Jain Date: Tue, 14 Apr 2020 07:06:58 +0000 (UTC) Message-Id: <20200414070642.22366-3-email@uajain.com> In-Reply-To: <20200414070642.22366-1-email@uajain.com> References: <20200414070642.22366-1-email@uajain.com> Mime-Version: 1.0 X-SG-EID: 1Q40EQ7YGir8a9gjSIAdTjhngY657NMk9ckeo4dbHZDiOpywc/L3L9rFqlwE4KPcZj5z9XHfwy1Ge6f/0y1LY2f51WPNaWJRgsmMiF70i3Un7/X3xGc5O03jiwnriUbhzR+WCKswraEyFVRl6lf7CN1wH8e1dnyLvdWcnwQlSRCk4dh0aVSmmqPu1dsb3gwxzmoHRSsxOmwxTMJJQhts9Z2iAND3ru/F+vAOih75TF4Mhxvefe3t79JuDG0xKYfk To: libcamera-devel@lists.libcamera.org Subject: [libcamera-devel] [PATCH 2/3] libcamera: camera: Exclude streams whose configuration cannot be updated X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Apr 2020 07:07:00 -0000 This prevents a null-deference below in the loop. Pointed out by Coverity DefectId=279069 Signed-off-by: Umang Jain --- src/libcamera/camera.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp index 8c3bb2c..926e414 100644 --- a/src/libcamera/camera.cpp +++ b/src/libcamera/camera.cpp @@ -777,9 +777,11 @@ int Camera::configure(CameraConfiguration *config) p_->activeStreams_.clear(); for (const StreamConfiguration &cfg : *config) { Stream *stream = cfg.stream(); - if (!stream) + if (!stream) { LOG(Camera, Fatal) << "Pipeline handler failed to update stream configuration"; + continue; + } stream->configuration_ = cfg; p_->activeStreams_.insert(stream);