From patchwork Thu Jan 2 00:03:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 2482 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 9F3B860467 for ; Thu, 2 Jan 2020 01:03:19 +0100 (CET) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 18F20516 for ; Thu, 2 Jan 2020 01:03:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1577923399; bh=FUxKMBA5/jyqMZ6vz1tALeTShye0Jx9bBDQuNkJ9hz0=; h=From:To:Subject:Date:From; b=Ur6B6wuodbM8BuU7tV9oVCzhRWtPEGZgLYi5qQ6dQR5SOebeTlIvEMXJ+I1X888K8 zExax4kQrl+UMujYaVsihwU618/PNVUSfk/rQCchI+zE+dtUcwPErSnM8A9jYDTjZ6 Od/cgRFiwPF3/6wjnZ9CekRQz7pFmtLvhk3Bmn9U= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Thu, 2 Jan 2020 02:03:06 +0200 Message-Id: <20200102000306.633-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] libcamera: pipeline: uvcvideo: Fix crash when default entity is not found 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: Thu, 02 Jan 2020 00:03:19 -0000 Commit e441f2c7f46d ("libcamera: pipeline: uvcvideo: Add controls support") broke handling of UVC devices without a default entity by turning the error check into an always false check. Fix it. Fixes: e441f2c7f46d ("libcamera: pipeline: uvcvideo: Add controls support") Signed-off-by: Laurent Pinchart Reviewed-by: Paul Elder Reviewed-by: Jacopo Mondi --- src/libcamera/pipeline/uvcvideo.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp index 3043366bee38..8d7f7ea79410 100644 --- a/src/libcamera/pipeline/uvcvideo.cpp +++ b/src/libcamera/pipeline/uvcvideo.cpp @@ -296,19 +296,19 @@ bool PipelineHandlerUVC::match(DeviceEnumerator *enumerator) std::unique_ptr data = utils::make_unique(this); /* Locate and initialise the camera data with the default video node. */ - for (MediaEntity *entity : media->entities()) { - if (entity->flags() & MEDIA_ENT_FL_DEFAULT) { - if (data->init(entity)) - return false; - break; - } - } - - if (!data) { + const std::vector &entities = media->entities(); + auto entity = std::find_if(entities.begin(), entities.end(), + [](MediaEntity *entity) { + return entity->flags() & MEDIA_ENT_FL_DEFAULT; + }); + if (entity == entities.end()) { LOG(UVC, Error) << "Could not find a default video device"; return false; } + if (data->init(*entity)) + return false; + /* Create and register the camera. */ std::set streams{ &data->stream_ }; std::shared_ptr camera = Camera::create(this, media->model(), streams);