diff options
author | Alexander Larsson <alexl@redhat.com> | 2010-06-22 10:53:24 +0200 |
---|---|---|
committer | Alexander Larsson <alexl@redhat.com> | 2010-06-22 10:53:24 +0200 |
commit | 9123e24e7b68ad36d4ac2b8f325ea249a5ea9ff5 (patch) | |
tree | 2af4db555c749d23e826b617d3f4fece63cd5c7a /server/red_worker.c | |
parent | ae1de849acd1e58772dc3f318324ed936ff5f21c (diff) | |
download | spice-9123e24e7b68ad36d4ac2b8f325ea249a5ea9ff5.tar.gz spice-9123e24e7b68ad36d4ac2b8f325ea249a5ea9ff5.tar.xz spice-9123e24e7b68ad36d4ac2b8f325ea249a5ea9ff5.zip |
Add destructor for demarshalled messages
This is required because we don't want to free messages that just
refer to the unparsed message (like SpiceMsgData).
Also, in the future we might need it for more complex demarshalling.
Diffstat (limited to 'server/red_worker.c')
-rw-r--r-- | server/red_worker.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/server/red_worker.c b/server/red_worker.c index 3a0b16e0..ee372220 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -10459,6 +10459,7 @@ static void red_receive(RedChannel *channel) uint8_t *data = (uint8_t *)(header+1); size_t parsed_size; uint8_t *parsed; + message_destructor_t parsed_free; n = channel->recive_data.now - (uint8_t *)header; if (n < sizeof(SpiceDataHeader) || @@ -10466,7 +10467,7 @@ static void red_receive(RedChannel *channel) break; } parsed = channel->parser((void *)data, data + header->size, header->type, - SPICE_VERSION_MINOR, &parsed_size); + SPICE_VERSION_MINOR, &parsed_size, &parsed_free); if (parsed == NULL) { red_printf("failed to parse message type %d", header->type); @@ -10479,7 +10480,7 @@ static void red_receive(RedChannel *channel) channel->disconnect(channel); return; } - free(parsed); + parsed_free(parsed); channel->recive_data.message = (SpiceDataHeader *)((uint8_t *)header + sizeof(SpiceDataHeader) + header->size); |