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

Reuse new spice_extra_assert macro

Browse Source 
Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Victor Toso <victortoso@redhat.com>
This commit is contained in:
Frediano Ziglio 2020-03-02 15:39:58 +00:00 committed by Victor Toso
parent 4924cf210e
commit 0f1a606d30
3 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/char-device.c
View File

@ -537,7 +537,7 @@ red_char_device_write_buffer_get(RedCharDevice *dev, RedCharDeviceClientOpaque *
if (ret) {
dev->priv->cur_pool_size -= ret->buf_size;
if (ret->buf_size < size) {
spice_assert(!spice_extra_checks || ret->priv->refs == 1);
spice_extra_assert(ret->priv->refs == 1);
red_char_device_write_buffer_free(ret);
ret = NULL;
}

28
server/red-stream-device.c
View File

@ -224,9 +224,7 @@ handle_msg_invalid(StreamDevice *dev, SpiceCharDeviceInstance *sin, const char *
{
static const char default_error_msg[] = "Protocol error";
if (spice_extra_checks) {
spice_assert(dev->hdr_pos >= sizeof(StreamDevHeader));
}
spice_extra_assert(dev->hdr_pos >= sizeof(StreamDevHeader));
if (!error_msg) {
error_msg = default_error_msg;
@ -260,10 +258,8 @@ handle_msg_format(StreamDevice *dev, SpiceCharDeviceInstance *sin)
{
SpiceCharDeviceInterface *sif = spice_char_device_get_interface(sin);
if (spice_extra_checks) {
spice_assert(dev->hdr_pos >= sizeof(StreamDevHeader));
spice_assert(dev->hdr.type == STREAM_TYPE_FORMAT);
}
spice_extra_assert(dev->hdr_pos >= sizeof(StreamDevHeader));
spice_extra_assert(dev->hdr.type == STREAM_TYPE_FORMAT);
int n = sif->read(sin, dev->msg->buf + dev->msg_pos, sizeof(StreamMsgFormat) - dev->msg_pos);
if (n < 0) {
@ -287,10 +283,8 @@ handle_msg_device_display_info(StreamDevice *dev, SpiceCharDeviceInstance *sin)
{
SpiceCharDeviceInterface *sif = spice_char_device_get_interface(sin);
if (spice_extra_checks) {
spice_assert(dev->hdr_pos >= sizeof(StreamDevHeader));
spice_assert(dev->hdr.type == STREAM_TYPE_DEVICE_DISPLAY_INFO);
}
spice_extra_assert(dev->hdr_pos >= sizeof(StreamDevHeader));
spice_extra_assert(dev->hdr.type == STREAM_TYPE_DEVICE_DISPLAY_INFO);
if (dev->msg_len < dev->hdr.size) {
dev->msg = g_realloc(dev->msg, dev->hdr.size);
@ -354,10 +348,8 @@ handle_msg_capabilities(StreamDevice *dev, SpiceCharDeviceInstance *sin)
{
SpiceCharDeviceInterface *sif = spice_char_device_get_interface(sin);
if (spice_extra_checks) {
spice_assert(dev->hdr_pos >= sizeof(StreamDevHeader));
spice_assert(dev->hdr.type == STREAM_TYPE_CAPABILITIES);
}
spice_extra_assert(dev->hdr_pos >= sizeof(StreamDevHeader));
spice_extra_assert(dev->hdr.type == STREAM_TYPE_CAPABILITIES);
if (dev->hdr.size > STREAM_MSG_CAPABILITIES_MAX_BYTES) {
return handle_msg_invalid(dev, sin, "Wrong size for StreamMsgCapabilities");
@ -388,10 +380,8 @@ handle_msg_data(StreamDevice *dev, SpiceCharDeviceInstance *sin)
SpiceCharDeviceInterface *sif = spice_char_device_get_interface(sin);
int n;
if (spice_extra_checks) {
spice_assert(dev->hdr_pos >= sizeof(StreamDevHeader));
spice_assert(dev->hdr.type == STREAM_TYPE_DATA);
}
spice_extra_assert(dev->hdr_pos >= sizeof(StreamDevHeader));
spice_extra_assert(dev->hdr.type == STREAM_TYPE_DATA);
/* make sure we have a large enough buffer for the whole frame */
/* ---

4
server/reds.c
View File

@ -4606,9 +4606,7 @@ red_char_device_vdi_port_finalize(GObject *object)
dev->priv->current_read_buf = NULL;
}
g_free(dev->priv->mig_data);
if (spice_extra_checks) {
spice_assert(dev->priv->num_read_buf == 0);
}
spice_extra_assert(dev->priv->num_read_buf == 0);
G_OBJECT_CLASS(red_char_device_vdi_port_parent_class)->finalize(object);
}