From 3399773dd5b602b33c075b43e8396f56c7ff8185 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 17 Sep 2010 18:52:05 -0700
Subject: Make EbuildIpcDaemon._input_handler() use a blanket exception handler
 for pickle.loads() since that can raise practically any exception when given
 corrupt data.

---
 pym/_emerge/EbuildIpcDaemon.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pym/_emerge/EbuildIpcDaemon.py b/pym/_emerge/EbuildIpcDaemon.py
index f6bfecfbe..66d868ba2 100644
--- a/pym/_emerge/EbuildIpcDaemon.py
+++ b/pym/_emerge/EbuildIpcDaemon.py
@@ -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]
-- 
cgit v1.2.3-1-g7c22