From patchwork Fri Oct 1 21:15:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 14026 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id C05BBBDC71 for ; Fri, 1 Oct 2021 21:15:59 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 83902691AA; Fri, 1 Oct 2021 23:15:59 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="jLqbjDq7"; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 50E56691A6 for ; Fri, 1 Oct 2021 23:15:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633122956; h=from:from: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; bh=crN8ugqgp3xaIBmuWZYMPqudPOK97CfYk3r3GgNJ5EA=; b=jLqbjDq7RSkKuuX+tdlPuM787F0sZPzM28vUeYtolngdIB1pk4uE+f7jnnukgL7HzcggK3 sHs9vpT5fHgpfKiFE1epj1AwNn6ZkEQ9KYmTVdNYxchSwvbth/mPKGuRdixxHqelydPuBf QEsBmX71yYuTBd6csjvkNlFQznPtA2U= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-488-LRjnSPMBPDapBPQfuEBwZA-1; Fri, 01 Oct 2021 17:15:55 -0400 X-MC-Unique: LRjnSPMBPDapBPQfuEBwZA-1 Received: by mail-wm1-f70.google.com with SMTP id n30-20020a05600c3b9e00b002fbbaada5d7so6490790wms.7 for ; Fri, 01 Oct 2021 14:15:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=crN8ugqgp3xaIBmuWZYMPqudPOK97CfYk3r3GgNJ5EA=; b=hgZUxAv9MOR0gJBv75i0THFfMaw/obGlRI59T+vCs9Ur7E+imIOTUZatJJ0gJqvp0X lbgD2PxGqDPH3q5hLBR5CTfxyNu7LU7HNFM/9JSUvU/rjGeDm8XL0VFOdZZt/5EoSg4M 04ErpjvS3Bz2o3WjFV/uM6v7GWzYoNrFuCFaWzQnkiTzuA7k573beCtXOKRpMRaL5+8q 49X9uVyY4/OpPslnHkcfYM5+T9+g+866U4liO9IUMG5QDl29KlpoEOIqkgrTWQ7ujewU XCnd8xcr/SgkK36uQE7CVCl63mXuogyuvq160vXMVguNMglM0G+HePeVP8Cvizif5PvS Pwhg== X-Gm-Message-State: AOAM531HTrkXRsaJXJ3otjdeSTbNGFFEXuCUS9MIiOOF4SmeSwlqHNXh UporQz6GH6/VtkS6iBQ45qfbIVAiSQ1W/h6p4w1jaWfaF2YP5Xxh4vwYy4R5OMb/EaXaq/WNvTD ZP7YWrMfUOc98lU5sbnV4PSJHIsAkrxdEEZY4MBfSyCLuTZXiv4JYejDJJBDV665dpFxu6faP7w LZrjq20nly X-Received: by 2002:a05:6000:550:: with SMTP id b16mr124292wrf.297.1633122953458; Fri, 01 Oct 2021 14:15:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxNRtFbi8wI2vAqzXTnMQmGs3ldTgJYSKYuYp/65Nmf30jKX3j+d1J5aR0MiW5xSdxdoRcjlQ== X-Received: by 2002:a05:6000:550:: with SMTP id b16mr124277wrf.297.1633122953163; Fri, 01 Oct 2021 14:15:53 -0700 (PDT) Received: from minerva.home ([92.176.231.106]) by smtp.gmail.com with ESMTPSA id y11sm8242871wrg.18.2021.10.01.14.15.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Oct 2021 14:15:52 -0700 (PDT) From: Javier Martinez Canillas To: libcamera-devel@lists.libcamera.org Date: Fri, 1 Oct 2021 23:15:25 +0200 Message-Id: <20211001211525.1423725-2-javierm@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211001211525.1423725-1-javierm@redhat.com> References: <20211001211525.1423725-1-javierm@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=javierm@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [libcamera-devel] [PATCH v2 2/2] android: Check if Stream configurations were generated correctly 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The libcamera Android Camera HAL generates camera configurations for the StillCapture, Raw and ViewFinder stream roles. But there is only a check if the configuration generation failed, for the StillCapture stream role. This could lead to a NULL pointer dereference if a pipeline handler fails to generate a default configuration for one of the other two stream roles. Signed-off-by: Javier Martinez Canillas Reviewed-by: Hirokazu Honda Reviewed-by: Jacopo Mondi --- Changes in v2: - Fix typos in commit message. src/android/camera_capabilities.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp index 87a6e1c6f26..baeedc11500 100644 --- a/src/android/camera_capabilities.cpp +++ b/src/android/camera_capabilities.cpp @@ -408,6 +408,11 @@ CameraCapabilities::initializeYUVResolutions(const PixelFormat &pixelFormat, std::vector supportedResolutions; std::unique_ptr cameraConfig = camera_->generateConfiguration({ StreamRole::Viewfinder }); + if (!cameraConfig) { + LOG(HAL, Error) << "Failed to get supported YUV resolutions"; + return supportedResolutions; + } + StreamConfiguration &cfg = cameraConfig->at(0); for (const Size &res : resolutions) { @@ -431,11 +436,17 @@ CameraCapabilities::initializeYUVResolutions(const PixelFormat &pixelFormat, std::vector CameraCapabilities::initializeRawResolutions(const PixelFormat &pixelFormat) { + std::vector supportedResolutions; std::unique_ptr cameraConfig = camera_->generateConfiguration({ StreamRole::Raw }); + if (!cameraConfig) { + LOG(HAL, Error) << "Failed to get supported Raw resolutions"; + return supportedResolutions; + } + StreamConfiguration &cfg = cameraConfig->at(0); const StreamFormats &formats = cfg.formats(); - std::vector supportedResolutions = formats.sizes(pixelFormat); + supportedResolutions = formats.sizes(pixelFormat); return supportedResolutions; }