{"id":14024,"url":"https://patchwork.libcamera.org/api/patches/14024/?format=json","web_url":"https://patchwork.libcamera.org/patch/14024/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20211001161100.1405576-1-javierm@redhat.com>","date":"2021-10-01T16:10:59","name":"[libcamera-devel,1/2] gstreamer: Check if Stream configurations were generated correctly","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"bfedef371f658f4306def156b8c51691a07b3a21","submitter":{"id":95,"url":"https://patchwork.libcamera.org/api/people/95/?format=json","name":"Javier Martinez Canillas","email":"javierm@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/14024/mbox/","series":[{"id":2590,"url":"https://patchwork.libcamera.org/api/series/2590/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2590","date":"2021-10-01T16:11:00","name":"[libcamera-devel,1/2] gstreamer: Check if Stream configurations were generated correctly","version":1,"mbox":"https://patchwork.libcamera.org/series/2590/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/14024/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14024/checks/","tags":{},"headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id A1227BDC71\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri,  1 Oct 2021 16:11:57 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5F877691AB;\n\tFri,  1 Oct 2021 18:11:57 +0200 (CEST)","from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [216.205.24.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0965B691AC\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri,  1 Oct 2021 18:11:54 +0200 (CEST)","from mail-wm1-f69.google.com (mail-wm1-f69.google.com\n\t[209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id\n\tus-mta-503-icnh1jaiNqm6sc2EI7k7eA-1; Fri, 01 Oct 2021 12:11:49 -0400","by mail-wm1-f69.google.com with SMTP id\n\t200-20020a1c00d1000000b0030b3dce20e1so6187643wma.0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 01 Oct 2021 09:11:49 -0700 (PDT)","from minerva.redhat.com ([92.176.231.106])\n\tby smtp.gmail.com with ESMTPSA id\n\td3sm7138164wrb.36.2021.10.01.09.11.46\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 01 Oct 2021 09:11:46 -0700 (PDT)"],"Authentication-Results":["lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"DTkMUyag\"; dkim-atps=neutral","relay.mimecast.com;\n\tauth=pass smtp.auth=CUSA124A263 smtp.mailfrom=javierm@redhat.com"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1633104710;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tcontent-transfer-encoding:content-transfer-encoding;\n\tbh=8CL6ai93xmy1pTcWIK7zEjpzBBOLUmpt/YveAEX1Vqc=;\n\tb=DTkMUyagkcQYuT0ZyJsDcxy1MUZ303dKKj6x/vMQ0ysVkIVfYSpdwAvCxe0odU8jP8hL1M\n\t6Eu1VMt3I0siv5dTncHSYHdEUEZG0Y4Oe79Cv4TPjZSPk0PkeFDFx65rmcdm2Yo5NXaamt\n\tU9tA30HHu/nn671O/LI0kzEfGQruY/0=","X-MC-Unique":"icnh1jaiNqm6sc2EI7k7eA-1","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version\n\t:content-transfer-encoding;\n\tbh=8CL6ai93xmy1pTcWIK7zEjpzBBOLUmpt/YveAEX1Vqc=;\n\tb=F79jZ9TuLC+GVXjUS2rMGUpI/PeK1TdUWzuO90O8GfkUGvsEo84nBQC5u6xNU7J1Hl\n\t9Vt9lNt5TJBwDbo1r3QAmzScs5SUwdfQyxDnD5jo2w/4HLFKy5RAntnZe+BEdU6L9O9c\n\tUIk9JwkK/X4QnWQgE64pVWAFzdZ3GI2ClI9MIrpTjYsvlbvD1slldYyr2Y8/qIMxPE11\n\tWX5e25uchZUG4Tw8BGDLYHqeqLickkPUJSTUta3rdqDL3HvBb4ITAxZPFyAhaq7mGGlu\n\te143bH/LaOkuVRIlpLblKbQwxh7HklqqBDP2lory9eEdbzQESdYcKf8uZb+GoFoUv1LR\n\tcYhQ==","X-Gm-Message-State":"AOAM532zb71UC6T4CqRnJ54Lyya115CvrZZpDvODZEAvz6t8RjjqqQlo\n\t5pY4w9J8l9/v/gYfW1BJIRwJq7EAhgsh3yD03yeTxuzzw7bATo797ZYd/Pe8GXIfDW78NTbB9S7\n\tQTa75Ltufybgzb9hCO4jR9t0pbIFUirhpDYmY9U1pij4fwjhkvWWriyR4D2qrp5Zqzf6CLMHtZh\n\tmTUhAsAfKo","X-Received":["by 2002:a1c:9dc8:: with SMTP id\n\tg191mr3075500wme.117.1633104707436; \n\tFri, 01 Oct 2021 09:11:47 -0700 (PDT)","by 2002:a1c:9dc8:: with SMTP id\n\tg191mr3075467wme.117.1633104707127; \n\tFri, 01 Oct 2021 09:11:47 -0700 (PDT)"],"X-Google-Smtp-Source":"ABdhPJwZwbm8zQDfzz14AFw+ro2FYi8BCdrxrTV+rejVGAeJtPhqUqQKXzeFErHeuK/XkaZxoEK2OQ==","From":"Javier Martinez Canillas <javierm@redhat.com>","To":"libcamera-devel@lists.libcamera.org","Date":"Fri,  1 Oct 2021 18:10:59 +0200","Message-Id":"<20211001161100.1405576-1-javierm@redhat.com>","X-Mailer":"git-send-email 2.31.1","MIME-Version":"1.0","X-Mimecast-Spam-Score":"0","X-Mimecast-Originator":"redhat.com","Content-Transfer-Encoding":"8bit","Content-Type":"text/plain; charset=\"US-ASCII\"","Subject":"[libcamera-devel] [PATCH 1/2] gstreamer: Check if Stream\n\tconfigurations were generated correctly","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"},"content":"Currently, the gst_libcamera_device_new() function assumes that a call to\nCamera::generateConfiguration() will always succeed, but that may not be\nthe case and the return value must to be checked.\n\nOtherwise, could lead to a NULL pointer deference if the pipeline handler\nfailed to generate a configuration for the VideoRecording stream role.\n\nSigned-off-by: Javier Martinez Canillas <javierm@redhat.com>\n---\n\n src/gstreamer/gstlibcameraprovider.cpp | 14 +++++++++++++-\n 1 file changed, 13 insertions(+), 1 deletion(-)","diff":"diff --git a/src/gstreamer/gstlibcameraprovider.cpp b/src/gstreamer/gstlibcameraprovider.cpp\nindex aee6f9a2be2..6eb0a0eb0c4 100644\n--- a/src/gstreamer/gstlibcameraprovider.cpp\n+++ b/src/gstreamer/gstlibcameraprovider.cpp\n@@ -132,6 +132,10 @@ gst_libcamera_device_new(const std::shared_ptr<Camera> &camera)\n \n \troles.push_back(StreamRole::VideoRecording);\n \tstd::unique_ptr<CameraConfiguration> config = camera->generateConfiguration(roles);\n+\tif (!config || config->size() != roles.size()) {\n+\t\tGST_ERROR(\"Failed to generate a default configuration for %s\", name);\n+\t\treturn nullptr;\n+\t}\n \n \tfor (const StreamConfiguration &stream_cfg : *config) {\n \t\tGstCaps *sub_caps = gst_libcamera_stream_formats_to_caps(stream_cfg.formats());\n@@ -189,8 +193,16 @@ gst_libcamera_provider_probe(GstDeviceProvider *provider)\n \n \tfor (const std::shared_ptr<Camera> &camera : cm->cameras()) {\n \t\tGST_INFO_OBJECT(self, \"Found camera '%s'\", camera->id().c_str());\n+\n+\t\tGstDevice *dev = gst_libcamera_device_new(camera);\n+\t\tif (!dev) {\n+\t\t\tGST_ERROR_OBJECT(self, \"Failed to add camera '%s'\",\n+\t\t\t\t\t camera->id().c_str());\n+\t\t\treturn nullptr;\n+\t\t}\n+\n \t\tdevices = g_list_append(devices,\n-\t\t\t\t\tg_object_ref_sink(gst_libcamera_device_new(camera)));\n+\t\t\t\t\tg_object_ref_sink(dev));\n \t}\n \n \treturn devices;\n","prefixes":["libcamera-devel","1/2"]}