]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
Issue #1423 - ensure that XMLTV grabber search does not crash.
authorAdam Sutton <dev@adamsutton.me.uk>
Tue, 4 Dec 2012 20:13:16 +0000 (20:13 +0000)
committerAdam Sutton <dev@adamsutton.me.uk>
Tue, 4 Dec 2012 20:15:15 +0000 (20:15 +0000)
It appears that if paths are duplicated in the PATH env variable the
internal search algorithm failed to detect this and could crash due to
an assert in the internal modlue registration code.

src/epggrab/module/xmltv.c

index 0352e4bb40f2815f59dd05fa45e44fce1d9e4ac2..9ac90bb3b56b85fb597319ba83b42ee403489663 100644 (file)
@@ -677,6 +677,7 @@ static void _xmltv_load_grabbers ( void )
         while ((de = readdir(dir))) {
           if (strstr(de->d_name, XMLTV_GRAB) != de->d_name) continue;
           snprintf(bin, sizeof(bin), "%s/%s", tmp, de->d_name);
+          if (epggrab_module_find_by_id(bin)) continue;
           if (stat(bin, &st)) continue;
           if (!(st.st_mode & S_IEXEC)) continue;
           if (!S_ISREG(st.st_mode)) continue;