Commit 07258900 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

vmware-vga: add vmsvga_verify_rect 



Add verification function for rectangles, returning
true if verification passes and false otherwise.

Cc: qemu-stable@nongnu.org
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarDon Koch <dkoch@verizon.com>
parent 83afa38e

hw/display/vmware_vga.c

+52 −1
Original line number Diff line number Diff line
@@ -294,6 +294,57 @@ enum { 
    SVGA_CURSOR_ON_RESTORE_TO_FB = 3,

};



static inline bool vmsvga_verify_rect(DisplaySurface *surface,

                                      const char *name,

                                      int x, int y, int w, int h)

{

    if (x < 0) {

        fprintf(stderr, "%s: x was < 0 (%d)\n", name, x);

        return false;

    }

    if (x > SVGA_MAX_WIDTH) {

        fprintf(stderr, "%s: x was > %d (%d)\n", name, SVGA_MAX_WIDTH, x);

        return false;

    }

    if (w < 0) {

        fprintf(stderr, "%s: w was < 0 (%d)\n", name, w);

        return false;

    }

    if (w > SVGA_MAX_WIDTH) {

        fprintf(stderr, "%s: w was > %d (%d)\n", name, SVGA_MAX_WIDTH, w);

        return false;

    }

    if (x + w > surface_width(surface)) {

        fprintf(stderr, "%s: width was > %d (x: %d, w: %d)\n",

                name, surface_width(surface), x, w);

        return false;

    }



    if (y < 0) {

        fprintf(stderr, "%s: y was < 0 (%d)\n", name, y);

        return false;

    }

    if (y > SVGA_MAX_HEIGHT) {

        fprintf(stderr, "%s: y was > %d (%d)\n", name, SVGA_MAX_HEIGHT, y);

        return false;

    }

    if (h < 0) {

        fprintf(stderr, "%s: h was < 0 (%d)\n", name, h);

        return false;

    }

    if (h > SVGA_MAX_HEIGHT) {

        fprintf(stderr, "%s: h was > %d (%d)\n", name, SVGA_MAX_HEIGHT, h);

        return false;

    }

    if (y + h > surface_height(surface)) {

        fprintf(stderr, "%s: update height > %d (y: %d, h: %d)\n",

                name, surface_height(surface), y, h);

        return false;

    }



    return true;

}



static inline void vmsvga_update_rect(struct vmsvga_state_s *s,

                                      int x, int y, int w, int h)

{