sdl: Move use of surface pointer below check for whether it is NULL

[Qemu-devel] [PATCH] sdl: Move use of surface pointer below check for whether it is NULL

Posted by Peter Maydell 7 years, 9 months ago

In commit 2ab858c6c38ee1 we added a use of the 'surf' variable
in sdl2_2d_update() that was unfortunately placed above the
early-exit-if-NULL check. Move it to where it ought to be.

Fixes: Coverity CID 1390598
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 ui/sdl2-2d.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/sdl2-2d.c b/ui/sdl2-2d.c
index 1f34817bae..85484407be 100644
--- a/ui/sdl2-2d.c
+++ b/ui/sdl2-2d.c
@@ -36,9 +36,7 @@ void sdl2_2d_update(DisplayChangeListener *dcl,
     struct sdl2_console *scon = container_of(dcl, struct sdl2_console, dcl);
     DisplaySurface *surf = qemu_console_surface(dcl->con);
     SDL_Rect rect;
-    size_t surface_data_offset = surface_bytes_per_pixel(surf) * x +
-                                 surface_stride(surf) * y;
-
+    size_t surface_data_offset;
     assert(!scon->opengl);
 
     if (!surf) {
@@ -48,6 +46,8 @@ void sdl2_2d_update(DisplayChangeListener *dcl,
         return;
     }
 
+    surface_data_offset = surface_bytes_per_pixel(surf) * x +
+                          surface_stride(surf) * y;
     rect.x = x;
     rect.y = y;
     rect.w = w;
-- 
2.17.0

Re: [Qemu-devel] [PATCH] sdl: Move use of surface pointer below check for whether it is NULL

Posted by Philippe Mathieu-Daudé 7 years, 9 months ago

On 05/15/2018 03:58 PM, Peter Maydell wrote:
> In commit 2ab858c6c38ee1 we added a use of the 'surf' variable
> in sdl2_2d_update() that was unfortunately placed above the
> early-exit-if-NULL check. Move it to where it ought to be.
> 
> Fixes: Coverity CID 1390598
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  ui/sdl2-2d.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/ui/sdl2-2d.c b/ui/sdl2-2d.c
> index 1f34817bae..85484407be 100644
> --- a/ui/sdl2-2d.c
> +++ b/ui/sdl2-2d.c
> @@ -36,9 +36,7 @@ void sdl2_2d_update(DisplayChangeListener *dcl,
>      struct sdl2_console *scon = container_of(dcl, struct sdl2_console, dcl);
>      DisplaySurface *surf = qemu_console_surface(dcl->con);
>      SDL_Rect rect;
> -    size_t surface_data_offset = surface_bytes_per_pixel(surf) * x +
> -                                 surface_stride(surf) * y;
> -
> +    size_t surface_data_offset;
>      assert(!scon->opengl);
>  
>      if (!surf) {
> @@ -48,6 +46,8 @@ void sdl2_2d_update(DisplayChangeListener *dcl,
>          return;
>      }
>  
> +    surface_data_offset = surface_bytes_per_pixel(surf) * x +
> +                          surface_stride(surf) * y;
>      rect.x = x;
>      rect.y = y;
>      rect.w = w;
>

Re: [Qemu-devel] [PATCH] sdl: Move use of surface pointer below check for whether it is NULL

Posted by Gerd Hoffmann 7 years, 8 months ago

On Tue, May 15, 2018 at 07:58:14PM +0100, Peter Maydell wrote:
> In commit 2ab858c6c38ee1 we added a use of the 'surf' variable
> in sdl2_2d_update() that was unfortunately placed above the
> early-exit-if-NULL check. Move it to where it ought to be.

Added to ui patch queue.

thanks,
  Gerd

Re: [Qemu-devel] [PATCH] sdl: Move use of surface pointer below check for whether it is NULL

Posted by Anatoly Trosinenko 7 years, 8 months ago

Please excuse me and thank you very much for the fix!

2018-05-18 10:04 GMT+03:00 Gerd Hoffmann <kraxel@redhat.com>:

> On Tue, May 15, 2018 at 07:58:14PM +0100, Peter Maydell wrote:
> > In commit 2ab858c6c38ee1 we added a use of the 'surf' variable
> > in sdl2_2d_update() that was unfortunately placed above the
> > early-exit-if-NULL check. Move it to where it ought to be.
>
> Added to ui patch queue.
>
> thanks,
>   Gerd
>
>


-- 
Anatoly <anatoly.trosinenko@gmail.com>