Commit e8dcb8ae authored by Peter Maydell's avatar Peter Maydell Committed by Gerd Hoffmann
Browse files

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



In commit 2ab858c6 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: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20180515185814.1374-1-peter.maydell@linaro.org
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 68898bc8

ui/sdl2-2d.c

+3 −3
Original line number Diff line number Diff line
@@ -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;