[libcamera-devel] [PATCH v2 03/24] libcamera: controls: Avoid exception in ControlList count() and find()
Niklas Söderlund
niklas.soderlund at ragnatech.se
Thu Nov 14 09:13:51 CET 2019
Hi Laurent,
Thanks for your work.
On 2019-11-08 22:53:48 +0200, Laurent Pinchart wrote:
> The ControlList count() and find() methods use at() to lookup the
> control numerical ID in the idmap_. This causes an exception to be
> thrown if the ID doesn't exist in the map. Fix it by using the find()
> method instead.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund at ragnatech.se>
> ---
> src/libcamera/controls.cpp | 18 +++++++++++++++---
> 1 file changed, 15 insertions(+), 3 deletions(-)
>
> diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp
> index 93ad2fc6a276..0c7cd449ad64 100644
> --- a/src/libcamera/controls.cpp
> +++ b/src/libcamera/controls.cpp
> @@ -491,7 +491,11 @@ const ControlInfoMap::mapped_type &ControlInfoMap::at(unsigned int id) const
> */
> ControlInfoMap::size_type ControlInfoMap::count(unsigned int id) const
> {
> - return count(idmap_.at(id));
> + auto iter = idmap_.find(id);
> + if (iter == idmap_.end())
> + return 0;
> +
> + return count(iter->second);
> }
>
> /**
> @@ -502,7 +506,11 @@ ControlInfoMap::size_type ControlInfoMap::count(unsigned int id) const
> */
> ControlInfoMap::iterator ControlInfoMap::find(unsigned int id)
> {
> - return find(idmap_.at(id));
> + auto iter = idmap_.find(id);
> + if (iter == idmap_.end())
> + return end();
> +
> + return find(iter->second);
> }
>
> /**
> @@ -513,7 +521,11 @@ ControlInfoMap::iterator ControlInfoMap::find(unsigned int id)
> */
> ControlInfoMap::const_iterator ControlInfoMap::find(unsigned int id) const
> {
> - return find(idmap_.at(id));
> + auto iter = idmap_.find(id);
> + if (iter == idmap_.end())
> + return end();
> +
> + return find(iter->second);
> }
>
> /**
> --
> Regards,
>
> Laurent Pinchart
>
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel at lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel
--
Regards,
Niklas Söderlund
More information about the libcamera-devel
mailing list