mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-14 23:13:30 +00:00
sdl: Move use of surface pointer below check for whether it is NULL
In commit 2ab858c6c3
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>
Message-id: 20180515185814.1374-1-peter.maydell@linaro.org
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
68898bc82b
commit
e8dcb8ae51
|
@ -36,9 +36,7 @@ void sdl2_2d_update(DisplayChangeListener *dcl,
|
||||||
struct sdl2_console *scon = container_of(dcl, struct sdl2_console, dcl);
|
struct sdl2_console *scon = container_of(dcl, struct sdl2_console, dcl);
|
||||||
DisplaySurface *surf = qemu_console_surface(dcl->con);
|
DisplaySurface *surf = qemu_console_surface(dcl->con);
|
||||||
SDL_Rect rect;
|
SDL_Rect rect;
|
||||||
size_t surface_data_offset = surface_bytes_per_pixel(surf) * x +
|
size_t surface_data_offset;
|
||||||
surface_stride(surf) * y;
|
|
||||||
|
|
||||||
assert(!scon->opengl);
|
assert(!scon->opengl);
|
||||||
|
|
||||||
if (!surf) {
|
if (!surf) {
|
||||||
|
@ -48,6 +46,8 @@ void sdl2_2d_update(DisplayChangeListener *dcl,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
surface_data_offset = surface_bytes_per_pixel(surf) * x +
|
||||||
|
surface_stride(surf) * y;
|
||||||
rect.x = x;
|
rect.x = x;
|
||||||
rect.y = y;
|
rect.y = y;
|
||||||
rect.w = w;
|
rect.w = w;
|
||||||
|
|
Loading…
Reference in a new issue