bugfix: Handle zero-len packets from ADB to avoid BSOD

Older versions of ADB send zero-makers, but other tools also do so. Handling these properly. Related issues: #461 #410 #248 Co-authored-by: Dimitar Stankov <[email protected]> Signed-off-by: Ivaylo Tsenkov <[email protected]>
dorssel · May 24, 2023 · 60d205d · 60d205d
1 parent 81e89fb
commit 60d205d
Showing 1 changed file with 22 additions and 13 deletions.
diff --git a/Usbipd/AttachedClient.cs b/Usbipd/AttachedClient.cs
@@ -348,23 +348,32 @@ async Task HandleSubmitAsync(UsbIpHeaderBasic basic, UsbIpHeaderCmdSubmit submit
             }
             pending = true;
 
-            // Input or output, exceptions or not, this buffer must be locked until after the ioctl has completed.
-            var gcHandle = GCHandle.Alloc(buf, GCHandleType.Pinned);
-            try
+            if (buf.Length > 0)
             {
-                urb.buf = gcHandle.AddrOfPinnedObject();
-                StructToBytes(urb, bytes);
-                ioctl = Device.IoControlAsync(SUPUSB_IOCTL.SEND_URB, bytes, bytes);
+                // Input or output, exceptions or not, this buffer must be locked until after the ioctl has completed.
+                var gcHandle = GCHandle.Alloc(buf, GCHandleType.Pinned);
+                try
+                {
+                    urb.buf = gcHandle.AddrOfPinnedObject();
+                    StructToBytes(urb, bytes);
+                    ioctl = Device.IoControlAsync(SUPUSB_IOCTL.SEND_URB, bytes, bytes);
+                }
+                catch
+                {
+                    gcHandle.Free();
+                    throw;
+                }
+                _ = ioctl.ContinueWith((task) =>
+                {
+                    gcHandle.Free();
+                }, CancellationToken.None, TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
             }
-            catch
+            else
             {
-                gcHandle.Free();
-                throw;
+                urb.buf = IntPtr.Zero;
+                StructToBytes(urb, bytes);
+                ioctl = Device.IoControlAsync(SUPUSB_IOCTL.SEND_URB, bytes, bytes);
             }
-            _ = ioctl.ContinueWith((task) =>
-            {
-                gcHandle.Free();
-            }, CancellationToken.None, TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
         }
 
         // At this point we have initiated the ioctl (and possibly awaited it for special cases).