pxcloud/spice-common
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice-common synced 2026-01-11 08:07:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

canvas_base: Fix missing ntohl for Win32 platform

Browse Source 
Win32 requires winsock2.h to be included in order to use ntohl.
To avoid the include use GUINT32_FROM_BE instead, already available.

This problem was reported by Biswapriyo Nath whom also tested the
solution for Win32.

Signed-off-by: Frediano Ziglio <freddy77@gmail.com>
This commit is contained in:
Frediano Ziglio 2021-05-07 19:42:38 +01:00
parent fcfe9104bd
commit bb0831cc10
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/canvas_base.c
View File

@ -25,9 +25,6 @@
#include <math.h>
#ifdef USE_LZ4
#ifndef WIN32
#include <arpa/inet.h>
#endif
#include <lz4.h>
#endif
#include <spice/macros.h>
@ -49,7 +46,7 @@ typedef struct SPICE_ATTR_PACKED {
} uint32_unaligned_t;
#include <spice/end-packed.h>
#define read_uint32_be(ptr) ntohl(((uint32_unaligned_t *)(ptr))->v)
#define READ_UINT32_BE(ptr) GUINT32_FROM_BE(((uint32_unaligned_t *)(ptr))->v)
#define ROUND(_x) ((int)floor((_x) + 0.5))
@ -585,7 +582,7 @@ static pixman_image_t *canvas_get_lz4(CanvasBase *canvas, SpiceImage *image)
goto format_error;
}
// Read next compressed block
enc_size = read_uint32_be(data);
enc_size = READ_UINT32_BE(data);
data += 4;
/* check overflow. This check is a bit different to avoid
* possible overflows. From previous check data_end - data cannot overflow.