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

libcamera: yaml_parser: Fix range checks for 32-bit integers

Browse Source 
The strtol() and strtoul() functions return long integers, which may be
larger than 32-bit integers. Add manual range checks.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Han-Lin Chen <hanlinchen@chromium.org>
This commit is contained in:
Laurent Pinchart
2022-05-25 01:58:13 +03:00
parent 9dacead615
commit 839c4a5a48
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcamera/yaml_parser.cpp
+9 -4
View File
@@ -10,6 +10,7 @@
#include <cstdlib>
#include <errno.h>
#include <functional>
#include <limits>
#include <libcamera/base/file.h>
#include <libcamera/base/log.h>
@@ -151,9 +152,11 @@ int32_t YamlObject::get(const int32_t &defaultValue, bool *ok) const
char *end;
errno = 0;
int32_t value = std::strtol(value_.c_str(), &end, 10);
long value = std::strtol(value_.c_str(), &end, 10);
if ('\0' != *end || errno == ERANGE)
if ('\0' != *end || errno == ERANGE ||
value < std::numeric_limits<int32_t>::min() ||
value > std::numeric_limits<int32_t>::max())
return defaultValue;
setOk(ok, true);
@@ -185,9 +188,11 @@ uint32_t YamlObject::get(const uint32_t &defaultValue, bool *ok) const
char *end;
errno = 0;
uint32_t value = std::strtoul(value_.c_str(), &end, 10);
unsigned long value = std::strtoul(value_.c_str(), &end, 10);
if ('\0' != *end || errno == ERANGE)
if ('\0' != *end || errno == ERANGE ||
value < std::numeric_limits<uint32_t>::min() ||
value > std::numeric_limits<uint32_t>::max())
return defaultValue;
setOk(ok, true);