diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2021-07-07 04:02:07 +0300 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2021-07-22 17:13:32 +0300 |
| commit | 3c636755607919bc99b2219683a402660740f0db (patch) | |
| tree | 625031b6a403c40c79840062d6bef662ba67de3c /src/cam/options.h | |
| parent | 11298f3d47f6a600c63428d660c00a69c32f4b9f (diff) | |
cam: options: Avoid copies of OptionvValue and KeyValueParser::Options
The OptionValue toKeyValues() and toArray() functions return a copy of
the values. This is unnecessary, and can cause use-after-free issues
when taking references to the return values. Return references instead
to optimize the implementation and avoid issues.
The behaviour of the two functions is now undefined in case of an option
type mismatch. The current implementation catches this with an
assertion.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'src/cam/options.h')
| -rw-r--r-- | src/cam/options.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cam/options.h b/src/cam/options.h index 83c409ae..0047b4f2 100644 --- a/src/cam/options.h +++ b/src/cam/options.h @@ -142,8 +142,8 @@ public: int toInteger() const; std::string toString() const; - KeyValueParser::Options toKeyValues() const; - std::vector<OptionValue> toArray() const; + const KeyValueParser::Options &toKeyValues() const; + const std::vector<OptionValue> &toArray() const; const OptionsParser::Options &children() const; |