[libcamera-devel] [PATCH] libcamera: yaml: Increase the YAML parser limit

[Laurent Pinchart]

On Tue, Jul 25, 2023 at 10:06:54AM +0100, Kieran Bingham via libcamera-devel wrote:
> Quoting Naushir Patuck via libcamera-devel (2023-07-25 10:03:16)
> > Increase the maximum list size to 2000 elements. This allows, for
> > example, larger lens shading config structures to be parsed correctly
> > without throwing any errors.
> > 
> > Signed-off-by: Naushir Patuck <naush at raspberrypi.com>
> 
> Reviewed-by: Kieran Bingham <kieran.bingham at ideasonboard.com>

We should improve this at some point, as bumping the limit from a random
value to a higher random value doesn't seem to be a great future-proof
option :-) For now,

Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>

> > ---
> >  src/libcamera/yaml_parser.cpp | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/src/libcamera/yaml_parser.cpp b/src/libcamera/yaml_parser.cpp
> > index 153a6d53c3f9..bf21141e20bb 100644
> > --- a/src/libcamera/yaml_parser.cpp
> > +++ b/src/libcamera/yaml_parser.cpp
> > @@ -676,7 +676,7 @@ int YamlParserContext::parseDictionaryOrList(YamlObject::Type type,
> >          * Add a safety counter to make sure we don't loop indefinitely in case
> >          * the YAML file is malformed.
> >          */
> > -       for (unsigned int sentinel = 1000; sentinel; sentinel--) {
> > +       for (unsigned int sentinel = 2000; sentinel; sentinel--) {
> >                 auto evt = nextEvent();
> >                 if (!evt)
> >                         return -EINVAL;

-- 
Regards,

Laurent Pinchart