Changeset 5659 in vbox

Timestamp:

Nov 9, 2007 7:26:17 PM (17 years ago)

Author:

vboxsync

Message:

Main: Fixed SerialPort::COMSETTER(Path) to not accept empty paths (forbidden by the XML Schema).

Location:

trunk/src/VBox/Main

Files:

• ParallelPortImpl.cpp (modified) (1 diff)
• SerialPortImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/ParallelPortImpl.cpp

@@ -482 +482 @@
 STDMETHODIMP ParallelPort::COMSETTER(Path) (INPTR BSTR aPath)
 {
-    if (!aPath || *aPath == 0)
-        return E_INVALIDARG;
+    if (!aPath)
+        return E_POINTER;
+
+    if (!*aPath)
+        return setError (E_INVALIDARG,
+            tr ("Parallel port path cannot be empty"));
 
     AutoCaller autoCaller (this);

trunk/src/VBox/Main/SerialPortImpl.cpp

@@ -568 +568 @@
 {
     if (!aPath)
-        return E_INVALIDARG;
+        return E_POINTER;
+
+    if (!*aPath)
+        return setError (E_INVALIDARG,
+            tr ("Serial port path cannot be empty"));
+
 
     AutoCaller autoCaller (this);