{"id":10212,"url":"https://patchwork.libcamera.org/api/patches/10212/?format=json","web_url":"https://patchwork.libcamera.org/patch/10212/","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":"<20201023101154.673143-1-kieran.bingham@ideasonboard.com>","date":"2020-10-23T10:11:54","name":"[libcamera-devel,v2] libcamera: pipeline: simple: Only connect created converters","commit_ref":"7adf3a069839c1b2c440b07ca2911ffc2d39e816","pull_url":null,"state":"accepted","archived":false,"hash":"a2c32702a4aa47049571713b33e81f52bfd952eb","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/10212/mbox/","series":[{"id":1408,"url":"https://patchwork.libcamera.org/api/series/1408/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1408","date":"2020-10-23T10:11:54","name":"[libcamera-devel,v2] libcamera: pipeline: simple: Only connect created converters","version":2,"mbox":"https://patchwork.libcamera.org/series/1408/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10212/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10212/checks/","tags":{},"headers":{"Return-Path":"","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 AD2BCBDB13\n\tfor ;\n\tFri, 23 Oct 2020 10:12:02 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 23EC5615DE;\n\tFri, 23 Oct 2020 12:12:02 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 72C4E61059\n\tfor ;\n\tFri, 23 Oct 2020 12:12:01 +0200 (CEST)","from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net\n\t[86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 768E7B26;\n\tFri, 23 Oct 2020 12:12:00 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"Gi3GXwK2\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1603447921;\n\tbh=Q/2I8U7LoupgmgduZY8YNqalPiS6/g7nBISs/w8lPDs=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=Gi3GXwK2tvXogOEOE4SmyP1SB2rAzBKrwjsT+EWMMw3kfgTPWH2Voico3G9lMotk2\n\tnp0p27UCPTlk52rZPTS0kXAuIRQ/G/fcR1Lb3ZEbMW0D5Pwgyzqjr3/0POpXa8co06\n\t7yPrBqZQJf8yvD9ZID/Dnfd2wInvkMFXCRM13kiE=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Fri, 23 Oct 2020 11:11:54 +0100","Message-Id":"<20201023101154.673143-1-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.25.1","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2] libcamera: pipeline: simple: Only\n\tconnect created converters","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Tomi Valkeinen ","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"If converter_->open() fails, the code deletes the converter_ but then\nhappily goes on, and at the very next lines will use converter_ to\nconnect the bufferReady signal.\n\nEnsure the converter is only connected when successfully opened by\nextending the conditional and connecting in an else scope instead.\n\nReported-by: Tomi Valkeinen \nSigned-off-by: Kieran Bingham \n---\n src/libcamera/pipeline/simple/simple.cpp | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 0d48e1b6acca..3d2039f3f269 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -774,9 +774,9 @@ bool SimplePipelineHandler::match(DeviceEnumerator *enumerator)\n \t\t\t\t<< \"Failed to open converter, disabling format conversion\";\n \t\t\tdelete converter_;\n \t\t\tconverter_ = nullptr;\n+\t\t} else {\n+\t\t\tconverter_->bufferReady.connect(this, &SimplePipelineHandler::converterDone);\n \t\t}\n-\n-\t\tconverter_->bufferReady.connect(this, &SimplePipelineHandler::converterDone);\n \t}\n \n \t/*\n","prefixes":["libcamera-devel","v2"]}