add exception handling about unsafe code in plugins.
authorkos <kos@dev3>
Thu, 19 Jan 2012 02:39:03 +0000 (11:39 +0900)
committerkos <kos@dev3>
Thu, 19 Jan 2012 02:39:03 +0000 (11:39 +0900)
lib/python/Plugins/SystemPlugins/Blindscan/plugin.py
lib/python/Plugins/SystemPlugins/CrashReport/plugin.py
lib/python/Plugins/SystemPlugins/CrashReport/sender.py

index fb22f1e..8c515c6 100644 (file)
@@ -453,17 +453,20 @@ class Blindscan(ConfigListScreen, Screen):
                                                "PILOT_OFF" : parm.Pilot_Off}
                                        pol = { "HORIZONTAL" : parm.Polarisation_Horizontal,
                                                "VERTICAL" : parm.Polarisation_Vertical}
                                                "PILOT_OFF" : parm.Pilot_Off}
                                        pol = { "HORIZONTAL" : parm.Polarisation_Horizontal,
                                                "VERTICAL" : parm.Polarisation_Vertical}
-                                       parm.orbital_position = self.orb_position
-                                       parm.polarisation = pol[data[1]]
-                                       parm.frequency = int(data[2])
-                                       parm.symbol_rate = int(data[3])
-                                       parm.system = sys[data[4]]
-                                       parm.inversion = inv[data[5]]
-                                       parm.pilot = pilot[data[6]]
-                                       parm.fec = fec[data[7]]
-                                       parm.modulation = qam[data[8]]
-                                       parm.rolloff = roll[data[9]]
-                                       self.tmp_tplist.append(parm)
+                                       try :
+                                               parm.orbital_position = self.orb_position
+                                               parm.polarisation = pol[data[1]]
+                                               parm.frequency = int(data[2])
+                                               parm.symbol_rate = int(data[3])
+                                               parm.system = sys[data[4]]
+                                               parm.inversion = inv[data[5]]
+                                               parm.pilot = pilot[data[6]]
+                                               parm.fec = fec[data[7]]
+                                               parm.modulation = qam[data[8]]
+                                               parm.rolloff = roll[data[9]]
+                                               self.tmp_tplist.append(parm)
+                                       except:
+                                               pass
                self.blindscan_session.close(True)
 
        def blindscanContainerAvail(self, str):
                self.blindscan_session.close(True)
 
        def blindscanContainerAvail(self, str):
index 1850ba1..d39d715 100644 (file)
@@ -278,10 +278,13 @@ def autosubmit(reason, **kwargs):
        loadConfig()
        import os
        def isExistCrashlog(d='/media/hdd'):
        loadConfig()
        import os
        def isExistCrashlog(d='/media/hdd'):
-           for f in os.listdir(d):
-               if f.startswith("enigma2_crash_") and f.endswith(".log"):
-                       return True
-           return False
+               try:
+                       for f in os.listdir(d):
+                               if f.startswith("enigma2_crash_") and f.endswith(".log"):
+                                       return True
+               except:
+                       pass
+               return False
 
        def cbDataAvail(ret_data):
                print ret_data
 
        def cbDataAvail(ret_data):
                print ret_data
index d983752..ada7bc4 100644 (file)
@@ -19,10 +19,13 @@ def getLogList(d):
     l = []
     if d is None or d == "":
         return l
     l = []
     if d is None or d == "":
         return l
-    for f in os.listdir(d):
-        if f.startswith("enigma2_crash_") and f.endswith(".log"):
-            print "[CrashReport] found : ", os.path.basename(f)
-            l.append(d + '/' + f)
+    try:
+        for f in os.listdir(d):
+            if f.startswith("enigma2_crash_") and f.endswith(".log"):
+                print "[CrashReport] found : ", os.path.basename(f)
+                l.append(d + '/' + f)
+    except:
+        pass
     return l
 
 def sendEmail(F, T, M, S="", FL=[]):
     return l
 
 def sendEmail(F, T, M, S="", FL=[]):