PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cam: options: Avoid copies of OptionvValue and KeyValueParser::Options

Browse Source 
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>
This commit is contained in:
Laurent Pinchart
2021-07-07 04:02:07 +03:00
parent 11298f3d47
commit 3c63675560
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/cam/options.cpp
View File

@@ -638,27 +638,27 @@ std::string OptionValue::toString() const
/**
* \brief Retrieve the value as a key-value list
* \return The option value as a KeyValueParser::Options, or an empty list if
* the value type isn't ValueType::ValueKeyValue
*
* The behaviour is undefined if the value type isn't ValueType::ValueKeyValue.
*
* \return The option value as a KeyValueParser::Options
*/
KeyValueParser::Options OptionValue::toKeyValues() const
const KeyValueParser::Options &OptionValue::toKeyValues() const
{
if (type_ != ValueKeyValue)
return KeyValueParser::Options();
assert(type_ == ValueKeyValue);
return keyValues_;
}
/**
* \brief Retrieve the value as an array
* \return The option value as a std::vector of OptionValue, or an empty vector
* if the value type isn't ValueType::ValueArray
*
* The behaviour is undefined if the value type isn't ValueType::ValueArray.
*
* \return The option value as a std::vector of OptionValue
*/
std::vector<OptionValue> OptionValue::toArray() const
const std::vector<OptionValue> &OptionValue::toArray() const
{
if (type_ != ValueArray)
return std::vector<OptionValue>{};
assert(type_ == ValueArray);
return array_;
}