Skip to content

Fix list segfault #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix list segfault #41

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32e53bf
Fix list corruption resulting in segfault
bertm Sep 3, 2016
00e9cd5
Clear the entire event, not just its first bytes
bertm Sep 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions events.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,15 @@ static void event_free_items(struct event_t* event)
free(event->episodeUri);
}

// Clears the contents of an event, but does not remove it from the list.
static void event_clear(struct event_t* event)
{
event_free_items(event);
struct list_head tmp = event->list;
memset(event, 0, sizeof(struct event_t));
event->list = tmp;
}

void event_free(struct event_t* event)
{
if (!event)
Expand Down Expand Up @@ -97,8 +106,7 @@ void process_event_message(char* method, struct htsp_message_t* msg)
fprintf(stderr,"WARNING: eventUpdate received for non-existent event %d, adding instead.\n",eventId);
}
} else {
event_free_items(event);
memset(event,0,sizeof(event));
event_clear(event);
if (strcmp(method,"eventAdd")==0) {
fprintf(stderr,"WARNING: eventAdd received for existing event %d, updating instead.\n",eventId);
}
Expand Down