From: Andreas Öman <andreas@lonelycoder.com>
Date: Tue, 4 Jan 2011 20:43:34 +0000 (+0100)
Subject: Don't crash if op == NULL, Ticket #334
X-Git-Tag: 2.99~120
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12169a45fc8fc0f5c5badf97c4102f20b2e9c209;p=thirdparty%2Ftvheadend.git

Don't crash if op == NULL, Ticket #334
---

diff --git a/src/webui/extjs.c b/src/webui/extjs.c
index 8eb3e36ac..58b9cc819 100644
--- a/src/webui/extjs.c
+++ b/src/webui/extjs.c
@@ -219,6 +219,9 @@ extjs_tablemgr(http_connection_t *hc, const char *remain, void *opaque)
   const char *op        = http_arg_get(&hc->hc_req_args, "op");
   const char *entries   = http_arg_get(&hc->hc_req_args, "entries");
 
+  if(op == NULL)
+    return 400;
+
   if(tablename == NULL || (dt = dtable_find(tablename)) == NULL)
     return 404;
   
@@ -356,6 +359,9 @@ extjs_channels(http_connection_t *hc, const char *remain, void *opaque)
   const char *op        = http_arg_get(&hc->hc_req_args, "op");
   const char *entries   = http_arg_get(&hc->hc_req_args, "entries");
 
+  if(op == NULL)
+    return 400;
+
   htsmsg_autodtor(in) =
     entries != NULL ? htsmsg_json_deserialize(entries) : NULL;
 
@@ -471,6 +477,9 @@ extjs_xmltv(http_connection_t *hc, const char *remain, void *opaque)
   htsmsg_t *out, *array, *e, *r;
   const char *s;
 
+  if(op == NULL)
+    return 400;
+
   pthread_mutex_lock(&global_lock);
 
   if(http_access_verify(hc, ACCESS_ADMIN)) {
@@ -1341,6 +1350,9 @@ extjs_iptvservices(http_connection_t *hc, const char *remain, void *opaque)
   service_t *t, **tvec;
   int count = 0, i = 0;
 
+  if(op == NULL)
+    return 400;
+
   pthread_mutex_lock(&global_lock);
 
   in = entries != NULL ? htsmsg_json_deserialize(entries) : NULL;