stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix NULL pointer deref

Browse source
This commit is contained in:
Andreas Öman 2010-03-17 22:17:16 +00:00
parent 769dee0f3b
commit 67113b82c2
5 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/dvr/dvr.h
View file

@ -189,7 +189,8 @@ typedef struct dvr_autorec_entry {
void dvr_entry_create_by_autorec(event_t *e, dvr_autorec_entry_t *dae);
dvr_entry_t *dvr_entry_create_by_event(event_t *e, const char *creator,
dvr_autorec_entry_t *dae);
dvr_autorec_entry_t *dae,
dvr_prio_t pri);
dvr_entry_t *dvr_entry_create(channel_t *ch, time_t start, time_t stop,
const char *title, const char *description,

6
src/dvr/dvr_db.c
View file

@ -213,14 +213,14 @@ dvr_entry_create(channel_t *ch, time_t start, time_t stop,
*/
dvr_entry_t *
dvr_entry_create_by_event(event_t *e, const char *creator,
dvr_autorec_entry_t *dae)
dvr_autorec_entry_t *dae, dvr_prio_t pri)
{
if(e->e_channel == NULL || e->e_title == NULL)
return NULL;
return dvr_entry_create(e->e_channel, e->e_start, e->e_stop,
e->e_title, e->e_desc, creator, dae, &e->e_episode,
dae->dae_pri);
pri);
}
@ -233,7 +233,7 @@ dvr_entry_create_by_autorec(event_t *e, dvr_autorec_entry_t *dae)
char buf[200];
snprintf(buf, sizeof(buf), "Auto recording by: %s", dae->dae_creator);
dvr_entry_create_by_event(e, buf, dae);
dvr_entry_create_by_event(e, buf, dae, dae->dae_pri);
}

2
src/htsp.c
View file

@ -500,7 +500,7 @@ htsp_method_addDvrEntry(htsp_connection_t *htsp, htsmsg_t *in)
de = dvr_entry_create_by_event(e,
htsp->htsp_username ?
htsp->htsp_username : "anonymous",
NULL);
NULL, DVR_PRIO_NORMAL);
dvr_status = de != NULL ? de->de_sched_state : DVR_NOSTATE;

2
src/webui/extjs.c
View file

@ -727,7 +727,7 @@ extjs_dvr(http_connection_t *hc, const char *remain, void *opaque)
return HTTP_STATUS_BAD_REQUEST;
}
dvr_entry_create_by_event(e, hc->hc_representative, NULL);
dvr_entry_create_by_event(e, hc->hc_representative, NULL, DVR_PRIO_NORMAL);
out = htsmsg_create_map();
htsmsg_add_u32(out, "success", 1);

3
src/webui/simpleui.c
View file

@ -209,7 +209,8 @@ page_einfo(http_connection_t *hc, const char *remain, void *opaque)
de = dvr_entry_find_by_event(e);
if((http_arg_get(&hc->hc_req_args, "rec")) != NULL) {
de = dvr_entry_create_by_event(e, hc->hc_username ?: "anonymous", NULL);
de = dvr_entry_create_by_event(e, hc->hc_username ?: "anonymous", NULL,
DVR_PRIO_NORMAL);
} else if(de != NULL && (http_arg_get(&hc->hc_req_args, "cancel")) != NULL) {
de = dvr_entry_cancel(de);
}