pxcloud/spice
6
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-08-07 05:57:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Fix possible quic_usr_more_lines_unstable() crash"

Browse Source 
This reverts commit 34e6a0a0d5.

Turns out this wasn't needed and the crash was due to other changes.
This commit is contained in:
Alexander Larsson 2010-03-10 12:06:41 +01:00
parent 454f44470d
commit eccbe9bb1a
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/red_worker.c
View File

@ -538,7 +538,6 @@ typedef struct {
int src_stride;
uint32_t dest_stride;
int lines;
int bytes;
int max_lines_bunch;
int input_bufs_pos;
RedCompressBuf *input_bufs[2];
@ -5300,7 +5299,7 @@ static int quic_usr_more_lines_unstable(QuicUsrContext *usr, uint8_t **out_lines
uint8_t *dest = out;
for (; src != end; src += quic_data->u.unstable_lines_data.src_stride,
dest += quic_data->u.unstable_lines_data.dest_stride) {
memcpy(dest, src, quic_data->u.unstable_lines_data.bytes);
memcpy(dest, src, quic_data->u.unstable_lines_data.dest_stride);
}
*out_lines = out;
return lines;
@ -5724,7 +5723,7 @@ static inline int red_quic_compress_image(DisplayChannel *display_channel, RedIm
QuicData *quic_data = &worker->quic_data;
QuicContext *quic = worker->quic;
QuicImageType type;
int size, bpp;
int size;
#ifdef COMPRESS_STAT
stat_time_t start_time = stat_now();
@ -5733,19 +5732,15 @@ static inline int red_quic_compress_image(DisplayChannel *display_channel, RedIm
switch (src->format) {
case SPICE_BITMAP_FMT_32BIT:
type = QUIC_IMAGE_TYPE_RGB32;
bpp = 4;
break;
case SPICE_BITMAP_FMT_RGBA:
type = QUIC_IMAGE_TYPE_RGBA;
bpp = 4;
break;
case SPICE_BITMAP_FMT_16BIT:
type = QUIC_IMAGE_TYPE_RGB16;
bpp = 2;
break;
case SPICE_BITMAP_FMT_24BIT:
type = QUIC_IMAGE_TYPE_RGB24;
bpp = 3;
break;
default:
return FALSE;
@ -5788,7 +5783,6 @@ static inline int red_quic_compress_image(DisplayChannel *display_channel, RedIm
quic_data->data.u.unstable_lines_data.src_stride = stride;
quic_data->data.u.unstable_lines_data.dest_stride = src->stride;
quic_data->data.u.unstable_lines_data.lines = src->y;
quic_data->data.u.unstable_lines_data.bytes = src->x * bpp;
quic_data->data.u.unstable_lines_data.input_bufs_pos = 0;
if (!(quic_data->data.u.unstable_lines_data.input_bufs[0] =
red_display_alloc_compress_buf(display_channel)) ||