From 6097dcd6d12e1b37fadc12d7dc14e47125c3b351 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 21 Mar 2012 09:34:23 +0100 Subject: [PATCH] Fix crash when cfg->dvr_config_name is NULL (default config) As suggested by opdenkamp - the cfg->dvr_config_name may be NULL in some cases. Add more restrictive checks in extjs_dvr() . This patch fixes the second location for the user check. --- src/webui/extjs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/webui/extjs.c b/src/webui/extjs.c index 647f28ff..2505232f 100644 --- a/src/webui/extjs.c +++ b/src/webui/extjs.c @@ -877,12 +877,13 @@ extjs_dvr(http_connection_t *hc, const char *remain, void *opaque) if (http_access_verify(hc, ACCESS_RECORDER_ALL)) { config_name = NULL; LIST_FOREACH(cfg, &dvrconfigs, config_link) { - if (strcmp(cfg->dvr_config_name, hc->hc_username) == 0) { + if (cfg->dvr_config_name && hc->hc_username && + strcmp(cfg->dvr_config_name, hc->hc_username) == 0) { config_name = cfg->dvr_config_name; break; } } - if (config_name == NULL) + if (config_name == NULL && hc->hc_username) tvhlog(LOG_INFO,"dvr","User '%s' has no dvr config with identical name, using default...", hc->hc_username); }