Added workaround for reading bytes-in-order

calcinai · Jun 6, 2016 · 5bec547 · 5bec547
1 parent 4ba090b
commit 5bec547
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/lib/MMap/StreamWrapper.php b/lib/MMap/StreamWrapper.php
@@ -134,7 +134,8 @@ private function subprocess_write($command, $data = ''){
      * @return string
      */
     private function subprocess_read($length){
-        return fread($this->pipes[1], $length);
+        $data = fread($this->pipes[1], $length);
+        return $data;
     }
 
 

diff --git a/subprocess/mmap-proxy.py b/subprocess/mmap-proxy.py
@@ -20,9 +20,15 @@
             mem.seek(address)
         elif(command == 'r'):
             length = struct.unpack('<H', sys.stdin.read(2))[0];
-            sys.stdout.write(mem.read(length)) #issue with consistency
+            #Dirty hack to allow for differences in read methods
+            #Read in blocks of 4 bytes
+            #Need to find a resolution
+            for x in range(0, length / 4):
+                sys.stdout.write(str(struct.pack('L', struct.unpack_from('L', mem, mem.tell())[0])))
+                mem.seek(4, os.SEEK_CUR)
+            #sys.stdout.write(mem.read(length)) #issue with consistency
         elif(command == 't'):
-            sys.stdout.write(struct.pack('<H', mem.tell()))
+            sys.stdout.write(str(struct.pack('<H', mem.tell())))
         elif(command == 'w'):
             length = struct.unpack('<H', sys.stdin.read(2))[0];
             mem.write(sys.stdin.read(length))