{"id":18525,"url":"https://patchwork.libcamera.org/api/1.1/patches/18525/?format=json","web_url":"https://patchwork.libcamera.org/patch/18525/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20230404-guard-idmap-v2-2-444d135b3895@baylibre.com>","date":"2023-04-05T08:14:31","name":"[libcamera-devel,v2,2/2] test: controls: control_info_map: Test default constructor","commit_ref":"683c6da83f078d09fc020d2b48a4abe471853b2b","pull_url":null,"state":"accepted","archived":false,"hash":"6dbdda2b1d4cc904c9a84eae65a13656ef199dfc","submitter":{"id":153,"url":"https://patchwork.libcamera.org/api/1.1/people/153/?format=json","name":"Mattijs Korpershoek","email":"mkorpershoek@baylibre.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/18525/mbox/","series":[{"id":3836,"url":"https://patchwork.libcamera.org/api/1.1/series/3836/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3836","date":"2023-04-05T08:14:29","name":"libcamera: controls: guard ControlInfoMap against nullptr idmap_","version":2,"mbox":"https://patchwork.libcamera.org/series/3836/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/18525/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/18525/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 5A2CDC32A4\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed,  5 Apr 2023 08:14:45 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 690886276A;\n\tWed,  5 Apr 2023 10:14:43 +0200 (CEST)","from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com\n\t[IPv6:2a00:1450:4864:20::32a])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4496861EC4\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed,  5 Apr 2023 10:14:41 +0200 (CEST)","by mail-wm1-x32a.google.com with SMTP id s13so20363187wmr.4\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 05 Apr 2023 01:14:41 -0700 (PDT)","from [192.168.1.20] ([2a01:cb19:85e6:1900:2bf7:7388:731d:c4e1])\n\tby smtp.gmail.com with ESMTPSA id\n\tp11-20020a05600c1d8b00b003ef36ef3833sm1403957wms.8.2023.04.05.01.14.40\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 05 Apr 2023 01:14:40 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1680682483;\n\tbh=msB3Wzrrhi3I9TAVWNTF1/dDu3KNso0+MWxlawnagD8=;\n\th=Date:References:In-Reply-To:To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=aKhz3CaLEACJwTtj8Jf/TDh43cTUvR76wtIr2zTAa/CZqMRLOLTU28JzPymTNFOUJ\n\tewKEVfTn0lMt/e+oTC3/pbCrKF2+cxrkWBdoV9RIIxBu2KO7mTBV3digUvQeX2upSV\n\tbIIxirWO9ei4Ui4xDv9DP3XgxEfTacu3VahOCPNvGsWBBbUltZrtEfS5s2SeeT53MH\n\tViddCztmxzTZO+Bn5s7QPSY9drnnA000JwTpDuZwd0qqcyehVFyLUGGJlUizHU17fP\n\tCEleczhazf+XY06InrSvLssEvpp5hZ41Vm8YI//FYW6NLemrVnHFUIME1/VYc5sG/k\n\t3tzRzAvEqcRRg==","v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=baylibre-com.20210112.gappssmtp.com; s=20210112; t=1680682481;\n\th=cc:to:in-reply-to:references:message-id:content-transfer-encoding\n\t:mime-version:subject:date:from:from:to:cc:subject:date:message-id\n\t:reply-to; bh=hz8Bv7ipSekhM/wCfh/FxRtDIkLeLdvvGon+FKEuBKA=;\n\tb=qjLfmr/yNcsqTn2gfjzQ4SuPT2j26jTyK/u4L07DY9cNkuQhLGtlseARHnEIw0Am+J\n\tUCHzVTgP//7C5/WZQwrAXyaJrXKxwyNgObzcFPDdkUTgcYMYSwIavl8SIjPSftfdnzIB\n\tu8u10ByiCub5vaoIvQA+4Gt+juueZ3isILICwr4y3Lxk7jEChl/2tOk0FYQkicPn91ZS\n\thf5qD190ZqdbQ9JKn2lDLyg6+bKWUhFG5gw4k/DHArM0qsvinqKeVY67eMjpCfRmtVDM\n\trjcA7zU5M6khsPsyg+ysAzgGfwyXoHS5Q5+9+l2EAow6+cnvXew6f1OiQ8PpLQooQX3/\n\tAerQ=="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected)\n\theader.d=baylibre-com.20210112.gappssmtp.com\n\theader.i=@baylibre-com.20210112.gappssmtp.com header.b=\"qjLfmr/y\"; \n\tdkim-atps=neutral","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112; t=1680682481;\n\th=cc:to:in-reply-to:references:message-id:content-transfer-encoding\n\t:mime-version:subject:date:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=hz8Bv7ipSekhM/wCfh/FxRtDIkLeLdvvGon+FKEuBKA=;\n\tb=fyRUHVirAwnUkvPnUNrBVYntQt4/6zWVh72C86IYwQnAJFulyUCK+FgWqm9jYPhpD6\n\tRYFKdPvK1W04QCgj6NN7AsJNeXToZg7wW121oVQ+j5TttYxE1gzB/c5lyPXFtt+N6swX\n\tuo8WTrgTeRhoC4OwZoHaWUEu/Hb92FGQVfWZCY+xpxkZCDepA83p7GkfMxdsuX4lzeoD\n\tDICb93gKuXanFsqETHLeYF8GwUvJ4zSqHNE9w1CRL5z1SuBASOrFzs3dj0BuYwIi6EO0\n\tMrH7dOiBnSogneD7Sk4UuE3YIPDeAFT5+T+10952GppGqptGRL/mFaZ6vn7pyfhK1OQh\n\tAm6A==","X-Gm-Message-State":"AAQBX9dStPje9BdIA9Uu6E8nRt8ZI+IVJ1Ni+mxEFbesXmrO2ypVU3kB\n\tkgGUai9xAIypEgkTmO5lSuRzoQ==","X-Google-Smtp-Source":"AKy350Z6abUXzjqsdWErg/b5QcUM5EeUHM9NYaTt4Asps7lrG8FuTxqoVkkRZnP4dRDpPUgD/hC0xg==","X-Received":"by 2002:a05:600c:2117:b0:3ee:672d:caa5 with SMTP id\n\tu23-20020a05600c211700b003ee672dcaa5mr3750029wml.17.1680682481091; \n\tWed, 05 Apr 2023 01:14:41 -0700 (PDT)","Date":"Wed, 05 Apr 2023 10:14:31 +0200","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"7bit","Message-Id":"<20230404-guard-idmap-v2-2-444d135b3895@baylibre.com>","References":"<20230404-guard-idmap-v2-0-444d135b3895@baylibre.com>","In-Reply-To":"<20230404-guard-idmap-v2-0-444d135b3895@baylibre.com>","To":"libcamera-devel@lists.libcamera.org","X-Mailer":"b4 0.13-dev-00303","Subject":"[libcamera-devel] [PATCH v2 2/2] test: controls: control_info_map:\n\tTest default constructor","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>","From":"Mattijs Korpershoek via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>","Reply-To":"Mattijs Korpershoek <mkorpershoek@baylibre.com>","Cc":"Jacopo Mondi <jacopo.mondi@ideasonboard.com>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"},"content":"ControlInfoMap can be default-constructed. In that case, some of its\nmembers (like idmap_) can be a nullptr, and ControlInfoMap.find() will segfault.\n\nAdd a test with a default constructed ControlInfoMap to cover this.\n\nSigned-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>\n---\n test/controls/control_info_map.cpp | 7 +++++++\n 1 file changed, 7 insertions(+)","diff":"diff --git a/test/controls/control_info_map.cpp b/test/controls/control_info_map.cpp\nindex db95945a1580..29b33515e48c 100644\n--- a/test/controls/control_info_map.cpp\n+++ b/test/controls/control_info_map.cpp\n@@ -75,6 +75,13 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n+\t\t/* Test looking up a control on a default-constructed infoMap */\n+\t\tconst ControlInfoMap emptyInfoMap;\n+\t\tif (emptyInfoMap.find(12345) != emptyInfoMap.end()) {\n+\t\t\tcerr << \"find() on empty ControlInfoMap failed\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n \t\treturn TestPass;\n \t}\n };\n","prefixes":["libcamera-devel","v2","2/2"]}