Changeset 18398 for titan/plugins/tithek/kinox.h

Timestamp:

11/01/12 00:23:21 (11 years ago)

Author:

nit

Message:

[titan] fix memleak, add if NULL, add return code

File:

• titan/plugins/tithek/kinox.h (modified) (5 diffs)

titan/plugins/tithek/kinox.h

@@ -43 +43 @@
 }
 
-void kinox_search(struct skin* grid, struct skin* listbox, struct skin* countlabel, struct skin* load, char* link, char* title)
+int kinox_search(struct skin* grid, struct skin* listbox, struct skin* countlabel, struct skin* load, char* link, char* title)
 {
+        int ret = 1;
+
+        if(listbox == NULL || listbox->select == NULL || listbox->select->handle == NULL)
+                return ret;
+
         char* search = textinputhist("Search", " ", "searchhist");
-                
         if(search != NULL)
         {
@@ -151 +155 @@
                                 menu = ostrcat("/tmp/tithek/kinox.search.list", NULL, 0, 0);
                                 writesys(menu, line, 0);
+                                free(((struct tithek*)listbox->select->handle)->link);
                                 ((struct tithek*)listbox->select->handle)->link = menu;
+                                ret = 0;
                         }
 
@@ -159 +165 @@
         }
         free(search), search = NULL;
+        return ret;
 }
 
-void kinox_hoster(struct skin* grid, struct skin* listbox, struct skin* countlabel, struct skin* load, char* link, char* title)
+int kinox_hoster(struct skin* grid, struct skin* listbox, struct skin* countlabel, struct skin* load, char* link, char* title)
 {
         debug(99, "link: %s", link);
+        int ret = 1;
         char* ip = NULL, *pos = NULL, *path = NULL, *tmpstr = NULL, *tmpstr1 = NULL, *tmpstr2 = NULL, *line = NULL, *url = NULL, *pathnew = NULL;               
+
+        if(listbox == NULL || listbox->select == NULL || listbox->select->handle == NULL)
+                return ret;
+
         ip = string_replace("http://", "", (char*)link, 0);
 
@@ -378 +390 @@
                 tmpstr = ostrcat("/tmp/tithek/kinox.hoster.list", NULL, 0, 0);
                 writesys(tmpstr, line, 0);
+                free(((struct tithek*)listbox->select->handle)->link);
                 ((struct tithek*)listbox->select->handle)->link = tmpstr;
-        }       
+                ret = 0;
+        }
+
+        return ret;
 }
 
-void kinox_hoster_series(struct skin* grid, struct skin* listbox, struct skin* countlabel, struct skin* load, char* link, char* title)
+int kinox_hoster_series(struct skin* grid, struct skin* listbox, struct skin* countlabel, struct skin* load, char* link, char* title)
 {
         debug(99, "link: %s", link);
+        int ret = 1;
         char* ip = NULL, *pathnew = NULL, *seriesid = NULL, *searchname = NULL, *url = NULL, *session = NULL, *episode = NULL, *pos = NULL, *path = NULL, *tmpstr = NULL, *tmpstr1 = NULL, *tmpstr2 = NULL, *line = NULL;               
+
+        if(listbox == NULL || listbox->select == NULL || listbox->select->handle == NULL)
+                return ret;
 
         int count0 = 0;
@@ -570 +590 @@
                 tmpstr = ostrcat("/tmp/tithek/kinox.hoster.series.list", NULL, 0, 0);
                 writesys(tmpstr, line, 0);
+                free(((struct tithek*)listbox->select->handle)->link);
                 ((struct tithek*)listbox->select->handle)->link = tmpstr;
-        }       
+                ret = 0;
+        }
+
+        return ret;
 }