vbox的更動 62179 路徑 trunk/src/VBox/ValidationKit

時間撮記:

2016-7-12 上午09:02:41 (8 年 以前)

作者:

vboxsync

訊息:

ValidationKit/txsclient.py: Convert string read from the stdin object to an array or it will get zero terminated by TransportBase.sendMsg corrupting the data to send

檔案:

• trunk/src/VBox/ValidationKit/testdriver/txsclient.py (修改) (2 筆差異)

trunk/src/VBox/ValidationKit/testdriver/txsclient.py

@@ -750 +750 @@
                    and not isinstance(oStdIn, basestring):
                     try:
-                        abInput = oStdIn.read(65536);
+                        sInput = oStdIn.read(65536);
                     except:
                         reporter.errorXcpt('read standard in');
@@ -756 +756 @@
                         rc = None;
                         break;
-                    if len(abInput) > 0:
-                        oStdIn.uTxsClientCrc32 = zlib.crc32(abInput, oStdIn.uTxsClientCrc32);
+                    if len(sInput) > 0:
+                        oStdIn.uTxsClientCrc32 = zlib.crc32(sInput, oStdIn.uTxsClientCrc32);
+                        # Convert to a byte array before handing it of to sendMsg or the string
+                        # will get some zero termination added breaking the CRC (and injecting
+                        # unwanted bytes).
+                        abInput = array.array('B', sInput);
                         rc = self.sendMsg('STDIN', (long(oStdIn.uTxsClientCrc32 & 0xffffffff), abInput));
                         if rc is not True: