From 8d4335cd89a94f73da3c4ef9778e342f71fbb50f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96man?= Date: Wed, 18 Nov 2009 19:03:56 +0000 Subject: [PATCH] Don't crash if we cannot figure out the adapter type when constructing the list of built-in dvb networks --- src/dvb/dvb_preconf.c | 1 + src/webui/extjs.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/dvb/dvb_preconf.c b/src/dvb/dvb_preconf.c index d58ee151..21148c9b 100644 --- a/src/dvb/dvb_preconf.c +++ b/src/dvb/dvb_preconf.c @@ -183,6 +183,7 @@ dvb_mux_preconf_get_node(int fetype, const char *node) nr = sizeof(regions_ATSC) / sizeof(regions_ATSC[0]); break; default: + tvhlog(LOG_ERR, "DVB", "No built-in config for fetype %d", fetype); return NULL; } diff --git a/src/webui/extjs.c b/src/webui/extjs.c index 29ae6aaa..0ebf368e 100644 --- a/src/webui/extjs.c +++ b/src/webui/extjs.c @@ -468,7 +468,8 @@ extjs_dvbnetworks(http_connection_t *hc, const char *remain, void *opaque) pthread_mutex_unlock(&global_lock); - out = dvb_mux_preconf_get_node(tda->tda_type, s); + if((out = dvb_mux_preconf_get_node(tda->tda_type, s)) == NULL) + return 404; htsmsg_json_serialize(out, hq, 0); htsmsg_destroy(out);