Check for globals in socket

bzr revid: fp@tinyerp.com-20080818223140-l69ekd9uyfw2c87w

1 files changed, 6 insertions, 1 deletions

diff --git a/bin/tiny_socket.py b/bin/tiny_socket.py
index 076155748d3..8f89fe97297 100644
--- a/bin/tiny_socket.py
+++ b/bin/tiny_socket.py
@@ -28,6 +28,7 @@
 ###############################################################################
 import socket
 import cPickle
+import cStringIO
 import marshal
 
 class Myexception(Exception):
@@ -82,7 +83,11 @@ class mysocket:
             if chunk == '':
                 raise RuntimeError, "socket connection broken"
             msg = msg + chunk
-        res = cPickle.loads(msg)
+        msgio = cStringIO.StringIO(msg)
+        unpickler = cPickle.Unpickler(msgio)
+        unpickler.find_global = None
+        res = unpickler.load()
+
         if isinstance(res[0],Exception):
             if exception:
                 raise Myexception(str(res[0]), str(res[1]))