RPJosh
/
neatvnc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

h264-encoder: Call on_packet_ready last in on_work_done 

The callback can result in the encoder being destroyed, so we can't
dereference access the encoder object after calling it.
pull/65/head
Andri Yngvason 2022-06-29 11:34:08 +00:00
parent e8f2481aa4
commit 4eb7a3a559
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/h264-encoder.c
View File

@ -446,11 +446,20 @@ static void h264_encoder__on_work_done(void* handle)
if (self->current_packet.len == 0)
return;
self->on_packet_ready(self->current_packet.data,
self->current_packet.len, pts, self->userdata);
vec_clear(&self->current_packet);
void* userdata = self->userdata;
// Must make a copy of packet because the callback might destroy the
// encoder object.
struct vec packet;
vec_init(&packet, self->current_packet.len);
vec_append(&packet, self->current_packet.data,
self->current_packet.len);
vec_clear(&self->current_packet);
h264_encoder__schedule_work(self);
self->on_packet_ready(packet.data, packet.len, pts, userdata);
vec_destroy(&packet);
}
static int find_render_node(char *node, size_t maxlen) {