[{"id":2389,"web_url":"https://patchwork.libcamera.org/comment/2389/","msgid":"<20190812110736.GM28494@bigcity.dyn.berto.se>","date":"2019-08-12T11:07:36","subject":"Re: [libcamera-devel] [PATCH] hal: Fix comparison of integers of\n\tdifferent signs","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Laurent,\n\nThanks for your patch.\n\nOn 2019-08-12 14:04:47 +0300, Laurent Pinchart wrote:\n> The CameraHalManager::getCameraInfo() validates the camera id it\n> receives from the camera service, and in doing so compares it with an\n> unsigned integer, generating a compiler error:\n> \n> src/android/camera_hal_manager.cpp:121:9: error: comparison of integers of different signs: 'int' and 'unsigned int' [-Werror,-Wsign-compare]\n> if (id >= numCameras() || id < 0) {\n> ~~ ^ ~~~~~~~~~~~~\n> \n> Fix this by turning the id into an unsigned int, as camera ids can't be\n> negative. If a negative id is received from the camera service it will\n> be converted to a large unsigned integer that will fail the comparison\n> with numCameras().\n> \n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Niklas Söderlund \n\n> ---\n> src/android/camera_hal_manager.cpp | 4 ++--\n> src/android/camera_hal_manager.h | 2 +-\n> 2 files changed, 3 insertions(+), 3 deletions(-)\n> \n> diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp\n> index 08c759dfd8a1..1e66f63240da 100644\n> --- a/src/android/camera_hal_manager.cpp\n> +++ b/src/android/camera_hal_manager.cpp\n> @@ -113,12 +113,12 @@ unsigned int CameraHalManager::numCameras() const\n> \treturn cameraManager_->cameras().size();\n> }\n> \n> -int CameraHalManager::getCameraInfo(int id, struct camera_info *info)\n> +int CameraHalManager::getCameraInfo(unsigned int id, struct camera_info *info)\n> {\n> \tif (!info)\n> \t\treturn -EINVAL;\n> \n> -\tif (id >= numCameras() || id < 0) {\n> +\tif (id >= numCameras()) {\n> \t\tLOG(HAL, Error) << \"Invalid camera id '\" << id << \"'\";\n> \t\treturn -EINVAL;\n> \t}\n> diff --git a/src/android/camera_hal_manager.h b/src/android/camera_hal_manager.h\n> index 8004aaf660f5..8228623aba90 100644\n> --- a/src/android/camera_hal_manager.h\n> +++ b/src/android/camera_hal_manager.h\n> @@ -30,7 +30,7 @@ public:\n> \tint close(CameraProxy *proxy);\n> \n> \tunsigned int numCameras() const;\n> -\tint getCameraInfo(int id, struct camera_info *info);\n> +\tint getCameraInfo(unsigned int id, struct camera_info *info);\n> \n> private:\n> \tvoid run() override;\n> -- \n> Regards,\n> \n> Laurent Pinchart\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"","Received":["from mail-lj1-x242.google.com (mail-lj1-x242.google.com\n\t[IPv6:2a00:1450:4864:20::242])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9084F61582\n\tfor ;\n\tMon, 12 Aug 2019 13:07:38 +0200 (CEST)","by mail-lj1-x242.google.com with SMTP id x4so5769371ljj.6\n\tfor ;\n\tMon, 12 Aug 2019 04:07:38 -0700 (PDT)","from localhost (h-177-236.A463.priv.bahnhof.se. [217.31.177.236])\n\tby smtp.gmail.com with ESMTPSA id\n\td3sm6111529lfj.15.2019.08.12.04.07.37\n\t(version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256);\n\tMon, 12 Aug 2019 04:07:37 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to\n\t:user-agent; bh=9LlDrds79djNWlc//bSn+2nwuOCglU5TnK1L/W8+Hz8=;\n\tb=vpLzusctYlfOlTPh9hVABhxzmr2BE5fOIw0owBPJ0KSIvEcA4ZZtNmXMk7GKGnsl7N\n\tRDJlBwzEjtgDuY5clujkpppFYloTmdkxwj2VtjgV8jf7yjdBf9hkB7oKskYQDNG0aIiI\n\tEeq/fGvqkchdrirUG0UAY78tTYLebuVlzKklFC9bxtGr3vfpInP1G6hE+CfIaytl4RJ2\n\t7h/qp6zhIakVuaF3bI3isMbyuYwif7zDF/fYy0QKRrjavMi9NCmSQJnUQuxdoUrglhrD\n\tmm7dU17S45AOXUM0f6n+s+qiFp563Fz2AZUrzGN7FaMk0XlUtbzUyfuf5l2O7ia/fBBR\n\teWJg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to:user-agent;\n\tbh=9LlDrds79djNWlc//bSn+2nwuOCglU5TnK1L/W8+Hz8=;\n\tb=KL+8fOPJzlyu8O2Alb1phVLqCWTgPo2yaWsNy5jLsL/euif37qCINbgMFG5HPJkc5g\n\tqFwiepVR2qgiTJRrrComQFhL/T8wReql9NGMMYa+qWWJEauBG2bNh43YxIzut170BvZg\n\tTLsjxKkQYXoc1bV9kWxjJhxB8kR0gDXIL55AxQuiTu39Snk45pYxeHyVcOJ5CVGLPV3U\n\tNbEe7Sd0NMfSUGhrKF6STUfSallFQnKR/Cm6WvYeOtz+b+LkJP2lHEUhY2Wyr0knwAgS\n\tBmvqNMYrgeEAwdpjrozxHPNJRhVuErUvAuT4zBL/1FL4UHEhGjyha7q7ZHnAskdrwPDf\n\t2YeA==","X-Gm-Message-State":"APjAAAUQsDINEoNYvoT7i2VJUS7hikgykT0vXbqW7dKIKLiMz9Fkx/K5\n\tsi1T3EgfWIgn/Ap+BD0SyoxoDCBpmoI=","X-Google-Smtp-Source":"APXvYqySSUV2ISghqea2k375uFP5tbmpVZY03B3OeihDwNrBu+dihMX7oXeN77y994bnIZbu07XKIw==","X-Received":"by 2002:a2e:8004:: with SMTP id j4mr2487453ljg.231.1565608057697;\n\tMon, 12 Aug 2019 04:07:37 -0700 (PDT)","Date":"Mon, 12 Aug 2019 13:07:36 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190812110736.GM28494@bigcity.dyn.berto.se>","References":"<20190812110447.9411-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20190812110447.9411-1-laurent.pinchart@ideasonboard.com>","User-Agent":"Mutt/1.12.1 (2019-06-15)","Subject":"Re: [libcamera-devel] [PATCH] hal: Fix comparison of integers of\n\tdifferent signs","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Mon, 12 Aug 2019 11:07:38 -0000"}},{"id":2391,"web_url":"https://patchwork.libcamera.org/comment/2391/","msgid":"<20190812120211.bwds22c55nprqr4t@uno.localdomain>","date":"2019-08-12T12:02:11","subject":"Re: [libcamera-devel] [PATCH] hal: Fix comparison of integers of\n\tdifferent signs","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Laurent,\n\nOn Mon, Aug 12, 2019 at 02:04:47PM +0300, Laurent Pinchart wrote:\n> The CameraHalManager::getCameraInfo() validates the camera id it\n> receives from the camera service, and in doing so compares it with an\n> unsigned integer, generating a compiler error:\n>\n> src/android/camera_hal_manager.cpp:121:9: error: comparison of integers of different signs: 'int' and 'unsigned int' [-Werror,-Wsign-compare]\n> if (id >= numCameras() || id < 0) {\n> ~~ ^ ~~~~~~~~~~~~\n>\n> Fix this by turning the id into an unsigned int, as camera ids can't be\n> negative. If a negative id is received from the camera service it will\n> be converted to a large unsigned integer that will fail the comparison\n> with numCameras().\n\nMy bad, I missed it!\nThanks for fixing\n\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n>\n> Signed-off-by: Laurent Pinchart \n> ---\n> src/android/camera_hal_manager.cpp | 4 ++--\n> src/android/camera_hal_manager.h | 2 +-\n> 2 files changed, 3 insertions(+), 3 deletions(-)\n>\n> diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp\n> index 08c759dfd8a1..1e66f63240da 100644\n> --- a/src/android/camera_hal_manager.cpp\n> +++ b/src/android/camera_hal_manager.cpp\n> @@ -113,12 +113,12 @@ unsigned int CameraHalManager::numCameras() const\n> \treturn cameraManager_->cameras().size();\n> }\n>\n> -int CameraHalManager::getCameraInfo(int id, struct camera_info *info)\n> +int CameraHalManager::getCameraInfo(unsigned int id, struct camera_info *info)\n> {\n> \tif (!info)\n> \t\treturn -EINVAL;\n>\n> -\tif (id >= numCameras() || id < 0) {\n> +\tif (id >= numCameras()) {\n> \t\tLOG(HAL, Error) << \"Invalid camera id '\" << id << \"'\";\n> \t\treturn -EINVAL;\n> \t}\n> diff --git a/src/android/camera_hal_manager.h b/src/android/camera_hal_manager.h\n> index 8004aaf660f5..8228623aba90 100644\n> --- a/src/android/camera_hal_manager.h\n> +++ b/src/android/camera_hal_manager.h\n> @@ -30,7 +30,7 @@ public:\n> \tint close(CameraProxy *proxy);\n>\n> \tunsigned int numCameras() const;\n> -\tint getCameraInfo(int id, struct camera_info *info);\n> +\tint getCameraInfo(unsigned int id, struct camera_info *info);\n>\n> private:\n> \tvoid run() override;\n> --\n> Regards,\n>\n> Laurent Pinchart\n>","headers":{"Return-Path":"","Received":["from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net\n\t[217.70.183.199])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AE43261582\n\tfor ;\n\tMon, 12 Aug 2019 14:00:45 +0200 (CEST)","from uno.localdomain\n\t(host64-130-dynamic.5-87-r.retail.telecomitalia.it [87.5.130.64])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay9-d.mail.gandi.net (Postfix) with ESMTPSA id CF29FFF807;\n\tMon, 12 Aug 2019 12:00:44 +0000 (UTC)"],"X-Originating-IP":"87.5.130.64","Date":"Mon, 12 Aug 2019 14:02:11 +0200","From":"Jacopo Mondi ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190812120211.bwds22c55nprqr4t@uno.localdomain>","References":"<20190812110447.9411-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"multipart/signed; micalg=pgp-sha256;\n\tprotocol=\"application/pgp-signature\"; boundary=\"zssbxipwtyz6co5v\"","Content-Disposition":"inline","In-Reply-To":"<20190812110447.9411-1-laurent.pinchart@ideasonboard.com>","User-Agent":"NeoMutt/20180716","Subject":"Re: [libcamera-devel] [PATCH] hal: Fix comparison of integers of\n\tdifferent signs","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Mon, 12 Aug 2019 12:00:45 -0000"}}]