tht_networkname() can return NULL. Avoid crashing.
This commit is contained in:
parent
b09164dc6c
commit
b24ac962ee
3 changed files with 13 additions and 6 deletions
|
@ -220,19 +220,22 @@ subscription_create_from_channel(channel_t *ch, unsigned int weight,
|
|||
|
||||
subscription_reschedule(NULL);
|
||||
|
||||
if(s->ths_transport == NULL)
|
||||
if(s->ths_transport == NULL) {
|
||||
tvhlog(LOG_NOTICE, "subscription",
|
||||
"No transponder available for subscription \"%s\" "
|
||||
"to channel \"%s\"",
|
||||
s->ths_title, ch->ch_name);
|
||||
else
|
||||
} else {
|
||||
const char *n;
|
||||
n = s->ths_transport->tht_networkname(s->ths_transport);
|
||||
tvhlog(LOG_INFO, "subscription",
|
||||
"\"%s\" subscribing on \"%s\", weight: %d, network: \"%s\", "
|
||||
"source: \"%s\", quality: %d",
|
||||
s->ths_title, ch->ch_name, weight,
|
||||
s->ths_transport->tht_networkname(s->ths_transport),
|
||||
n ?: "<N/A>",
|
||||
s->ths_transport->tht_sourcename(s->ths_transport),
|
||||
s->ths_transport->tht_quality_index(s->ths_transport));
|
||||
}
|
||||
return s;
|
||||
}
|
||||
|
||||
|
|
|
@ -633,6 +633,7 @@ transport_build_stream_start_msg(th_transport_t *t)
|
|||
{
|
||||
htsmsg_t *m, *streams, *c;
|
||||
th_stream_t *st;
|
||||
const char *n;
|
||||
|
||||
lock_assert(&t->tht_stream_mutex);
|
||||
|
||||
|
@ -651,7 +652,9 @@ transport_build_stream_start_msg(th_transport_t *t)
|
|||
}
|
||||
|
||||
htsmsg_add_msg(m, "streams", streams);
|
||||
htsmsg_add_str(m, "network", t->tht_networkname(t));
|
||||
if((n = t->tht_networkname(t)) != NULL)
|
||||
htsmsg_add_str(m, "network", n);
|
||||
|
||||
htsmsg_add_str(m, "source", t->tht_sourcename(t));
|
||||
return m;
|
||||
}
|
||||
|
|
|
@ -567,7 +567,7 @@ build_transport_msg(th_transport_t *t)
|
|||
{
|
||||
htsmsg_t *r = htsmsg_create_map();
|
||||
th_stream_t *st;
|
||||
|
||||
const char *n;
|
||||
char video[200];
|
||||
char audio[200];
|
||||
char subtitles[200];
|
||||
|
@ -577,7 +577,8 @@ build_transport_msg(th_transport_t *t)
|
|||
htsmsg_add_str(r, "name", t->tht_svcname);
|
||||
|
||||
htsmsg_add_str(r, "provider", t->tht_provider ?: "");
|
||||
htsmsg_add_str(r, "network", t->tht_networkname(t));
|
||||
if((n = t->tht_networkname(t)) != NULL)
|
||||
htsmsg_add_str(r, "network", n);
|
||||
htsmsg_add_str(r, "source", t->tht_sourcename(t));
|
||||
|
||||
htsmsg_add_str(r, "status", "");
|
||||
|
|
Loading…
Add table
Reference in a new issue