[v1] pipeline: rpi: Fix potential empty optional read
diff mbox series

Message ID 20250325140745.1400058-1-barnabas.pocze@ideasonboard.com
State New
Headers show
Series
  • [v1] pipeline: rpi: Fix potential empty optional read
Related show

Commit Message

Barnabás Pőcze March 25, 2025, 2:07 p.m. UTC 
If `!target`, then `*target` is undefined behaviour, so check if the optional
is empty when printing the error message. Simplify the check as well.

Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
---
 src/libcamera/pipeline/rpi/vc4/vc4.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--
2.49.0

Comments

Laurent Pinchart March 26, 2025, 2 a.m. UTC | #1 
Hi Barnabás,

Thank you for the patch.

On Tue, Mar 25, 2025 at 03:07:45PM +0100, Barnabás Pőcze wrote:
> If `!target`, then `*target` is undefined behaviour, so check if the optional
> is empty when printing the error message. Simplify the check as well.
> 
> Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>

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

> ---
>  src/libcamera/pipeline/rpi/vc4/vc4.cpp | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/libcamera/pipeline/rpi/vc4/vc4.cpp b/src/libcamera/pipeline/rpi/vc4/vc4.cpp
> index fd8d84b14..fe910bdf2 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;
>  	}
>

Patch
diff mbox series 

diff --git a/src/libcamera/pipeline/rpi/vc4/vc4.cpp b/src/libcamera/pipeline/rpi/vc4/vc4.cpp
index fd8d84b14..fe910bdf2 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;
 	}