diff options
| author | Barnabás Pőcze <barnabas.pocze@ideasonboard.com> | 2025-03-21 10:51:05 +0100 |
|---|---|---|
| committer | Barnabás Pőcze <barnabas.pocze@ideasonboard.com> | 2025-04-02 19:37:38 +0200 |
| commit | a2a7f4fc2d2a3fa7e5cb1b7d35b369d64f86c2ab (patch) | |
| tree | 1d1dea1b047f0a9c5b01618f9ef63d69ae1b4ed4 /src | |
| parent | 61d93434f5830cc9b1e057db2834fc2a64622f21 (diff) | |
pipeline: rpi: Fix potential empty optional read
If `!target`, then `*target` is undefined behaviour, so check if the optional
is empty when printing the error message. Simplify the check as well.
Fixes: 6c71ee1f153051 ("pipeline: raspberrypi: Introduce PipelineHandlerBase class")
Fixes: 841ef2b4bb08ba ("pipeline: rpi: Add support for Raspberry Pi 5")
Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Naushir Patuck <naush@raspberrypi.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcamera/pipeline/rpi/pisp/pisp.cpp | 4 | ||||
| -rw-r--r-- | src/libcamera/pipeline/rpi/vc4/vc4.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libcamera/pipeline/rpi/pisp/pisp.cpp b/src/libcamera/pipeline/rpi/pisp/pisp.cpp index 42ca7c80..91e7f4c9 100644 --- a/src/libcamera/pipeline/rpi/pisp/pisp.cpp +++ b/src/libcamera/pipeline/rpi/pisp/pisp.cpp @@ -1350,9 +1350,9 @@ int PiSPCameraData::platformPipelineConfigure(const std::unique_ptr<YamlObject> } std::optional<std::string> target = (*root)["target"].get<std::string>(); - if (!target || *target != "pisp") { + if (target != "pisp") { LOG(RPI, Error) << "Unexpected target reported: expected \"pisp\", got " - << *target; + << (target ? target->c_str() : "(unknown)"); return -EINVAL; } diff --git a/src/libcamera/pipeline/rpi/vc4/vc4.cpp b/src/libcamera/pipeline/rpi/vc4/vc4.cpp index fd8d84b1..fe910bdf 100644 --- a/src/libcamera/pipeline/rpi/vc4/vc4.cpp +++ b/src/libcamera/pipeline/rpi/vc4/vc4.cpp @@ -510,9 +510,9 @@ int Vc4CameraData::platformPipelineConfigure(const std::unique_ptr<YamlObject> & } std::optional<std::string> target = (*root)["target"].get<std::string>(); - if (!target || *target != "bcm2835") { + if (target != "bcm2835") { LOG(RPI, Error) << "Unexpected target reported: expected \"bcm2835\", got " - << *target; + << (target ? target->c_str() : "(unknown)"); return -EINVAL; } |