diff options
author | Alon Levy <alevy@redhat.com> | 2012-09-03 19:04:16 +0300 |
---|---|---|
committer | Alon Levy <alevy@redhat.com> | 2012-09-03 19:27:22 +0300 |
commit | 1c4e315e3e8261522d4944a75e4ca3917c505d2b (patch) | |
tree | aee87b0d57b03b8e7a3131dbd0aa2e2aa071f43a /server/red_worker.c | |
parent | f567f6b4cd696277fb48d7778d1aa0626f312d72 (diff) | |
download | spice-1c4e315e3e8261522d4944a75e4ca3917c505d2b.tar.gz spice-1c4e315e3e8261522d4944a75e4ca3917c505d2b.tar.xz spice-1c4e315e3e8261522d4944a75e4ca3917c505d2b.zip |
server/red_parse_qxl: add bitmap consistency check
Just checks stride vs width times bpp.
This fixes a potential abort on guest generated bad images in
glz_encoder.
Other files touched to move some consts to red_common, they are
static so no problem to be defined in both red_worker.c and
red_parse_qxl.c .
Diffstat (limited to 'server/red_worker.c')
-rw-r--r-- | server/red_worker.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/server/red_worker.c b/server/red_worker.c index 133ba943..eee9915d 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -5887,20 +5887,6 @@ static inline int _stride_is_extra(SpiceBitmap *bitmap) return 0; } -static const LzImageType MAP_BITMAP_FMT_TO_LZ_IMAGE_TYPE[] = { - LZ_IMAGE_TYPE_INVALID, - LZ_IMAGE_TYPE_PLT1_LE, - LZ_IMAGE_TYPE_PLT1_BE, - LZ_IMAGE_TYPE_PLT4_LE, - LZ_IMAGE_TYPE_PLT4_BE, - LZ_IMAGE_TYPE_PLT8, - LZ_IMAGE_TYPE_RGB16, - LZ_IMAGE_TYPE_RGB24, - LZ_IMAGE_TYPE_RGB32, - LZ_IMAGE_TYPE_RGBA, - LZ_IMAGE_TYPE_A8 -}; - typedef struct compress_send_data_t { void* comp_buf; uint32_t comp_buf_size; @@ -5908,7 +5894,6 @@ typedef struct compress_send_data_t { int is_lossy; } compress_send_data_t; - static inline int red_glz_compress_image(DisplayChannelClient *dcc, SpiceImage *dest, SpiceBitmap *src, Drawable *drawable, compress_send_data_t* o_comp_data) |