Changeset 65895 in vbox for trunk/src/VBox/Devices

Timestamp:

Feb 28, 2017 10:41:05 AM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

113685

Message:

USB/VUSBSnifferPcapNg: Adjust data length only if there if it is big enough + typo fixes

File:

• trunk/src/VBox/Devices/USB/VUSBSnifferPcapNg.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/USB/VUSBSnifferPcapNg.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2014-2016 Oracle Corporation
+ * Copyright (C) 2014-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -450 +450 @@
 
 /** @interface_method_impl{VUSBSNIFFERFMT,pfnInit} */
-static DECLCALLBACK(int) vusbSnifferFmtPcanNgInit(PVUSBSNIFFERFMTINT pThis, PVUSBSNIFFERSTRM pStrm)
+static DECLCALLBACK(int) vusbSnifferFmtPcapNgInit(PVUSBSNIFFERFMTINT pThis, PVUSBSNIFFERSTRM pStrm)
 {
     pThis->pStrm       = pStrm;
@@ -548 +548 @@
 
 /** @interface_method_impl{VUSBSNIFFERFMT,pfnDestroy} */
-static DECLCALLBACK(void) vusbSnifferFmtPcanNgDestroy(PVUSBSNIFFERFMTINT pThis)
+static DECLCALLBACK(void) vusbSnifferFmtPcapNgDestroy(PVUSBSNIFFERFMTINT pThis)
 {
     if (pThis->pbBlockData)
@@ -556 +556 @@
 
 /** @interface_method_impl{VUSBSNIFFERFMT,pfnRecordEvent} */
-static DECLCALLBACK(int) vusbSnifferFmtPcanNgRecordEvent(PVUSBSNIFFERFMTINT pThis, PVUSBURB pUrb, VUSBSNIFFEREVENT enmEvent)
+static DECLCALLBACK(int) vusbSnifferFmtPcapNgRecordEvent(PVUSBSNIFFERFMTINT pThis, PVUSBURB pUrb, VUSBSNIFFEREVENT enmEvent)
 {
     DumpFileEpb Epb;
@@ -643 +643 @@
             cbDataLength = 0;
     }
-    else if (pUrb->enmDir == VUSBDIRECTION_SETUP)
+    else if (   pUrb->enmDir == VUSBDIRECTION_SETUP
+             && cbDataLength >= sizeof(VUSBSETUP))
         cbDataLength -= sizeof(VUSBSETUP);
 
@@ -721 +722 @@
     sizeof(VUSBSNIFFERFMTINT),
     /** pfnInit */
-    vusbSnifferFmtPcanNgInit,
+    vusbSnifferFmtPcapNgInit,
     /** pfnDestroy */
-    vusbSnifferFmtPcanNgDestroy,
+    vusbSnifferFmtPcapNgDestroy,
     /** pfnRecordEvent */
-    vusbSnifferFmtPcanNgRecordEvent
+    vusbSnifferFmtPcapNgRecordEvent
 };