Browse Source

fix segfault when both forwarding and output are enabled

fixes #556

Change-Id: I80179a55bb9bac5478ed70e445bd4e2b87dfaaa6
changes/91/21291/1
Richard Fuchs 8 years ago
parent
commit
78accdb639
2 changed files with 7 additions and 5 deletions
  1. +0
    -2
      recording-daemon/forward.c
  2. +7
    -3
      recording-daemon/stream.c

+ 0
- 2
recording-daemon/forward.c View File

@ -66,11 +66,9 @@ int forward_packet(metafile_t *mf, unsigned char *buf, unsigned len) {
goto err;
}
free(buf);
return 0;
err:
free(buf);
return -1;
}

+ 7
- 3
recording-daemon/stream.c View File

@ -68,14 +68,18 @@ static void stream_handler(handler_t *handler) {
// got a packet
pthread_mutex_unlock(&stream->lock);
if (output_enabled)
packet_process(stream, buf, ret);
if (forward_to){
if (forward_packet(stream->metafile,buf,ret))
if (forward_packet(stream->metafile,buf,ret)) // leaves buf intact
g_atomic_int_inc(&stream->metafile->forward_failed);
else
g_atomic_int_inc(&stream->metafile->forward_count);
}
if (output_enabled)
packet_process(stream, buf, ret); // consumes buf
else
free(buf);
log_info_call = NULL;
log_info_stream = NULL;
return;


Loading…
Cancel
Save