Make EbuildIpcDaemon._input_handler() use a blanket exception
authorZac Medico <zmedico@gentoo.org>
Sat, 18 Sep 2010 01:52:05 +0000 (18:52 -0700)
committerZac Medico <zmedico@gentoo.org>
Sat, 18 Sep 2010 01:52:05 +0000 (18:52 -0700)
handler for pickle.loads() since that can raise practically
any exception when given corrupt data.

pym/_emerge/EbuildIpcDaemon.py

index f6bfecfbe1e4e7c0bd8688f8618c36f2040e2c77..66d868ba2bb3d1deffecb1ef111a77c48f490c07 100644 (file)
@@ -36,8 +36,11 @@ class EbuildIpcDaemon(FifoIpcDaemon):
 
                        try:
                                obj = pickle.loads(buf.tostring())
-                       except (EnvironmentError, EOFError, ValueError,
-                               pickle.UnpicklingError):
+                       except SystemExit:
+                               raise
+                       except Exception:
+                               # The pickle module can raise practically
+                               # any exception when given corrupt data.
                                pass
                        else:
                                cmd_key = obj[0]