Changeset 25098 in vbox

Timestamp:

Nov 30, 2009 10:01:05 AM (15 years ago)

Author:

vboxsync

Message:

Main/NetworkAdapter: fix NULL handling in NAT network attribute

Location:

trunk/src/VBox/Main

Files:

• NetworkAdapterImpl.cpp (modified) (2 diffs)
• include/NetworkAdapterImpl.h (modified) (1 diff)

trunk/src/VBox/Main/NetworkAdapterImpl.cpp

@@ -506 +506 @@
 STDMETHODIMP NetworkAdapter::COMSETTER(NATNetwork) (IN_BSTR aNATNetwork)
 {
+    Bstr bstrEmpty("");
+    if (!aNATNetwork)
+        aNATNetwork = bstrEmpty;
+
     AutoCaller autoCaller(this);
     CheckComRCReturnRC(autoCaller.rc());
@@ -935 +939 @@
         case NetworkAttachmentType_NAT:
             mData->mNATNetwork = data.strName;
+            if (mData->mNATNetwork.isNull())
+                mData->mNATNetwork = "";
             rc = AttachToNAT();
             CheckComRCReturnRC(rc);

trunk/src/VBox/Main/include/NetworkAdapterImpl.h

@@ -45 +45 @@
     struct Data
     {
-        Data()
-            : mSlot (0), mEnabled (FALSE)
-            , mAttachmentType (NetworkAttachmentType_Null)
-            ,  mCableConnected (TRUE), mLineSpeed (0), mTraceEnabled (FALSE)
-            , mHostInterface ("") /* cannot be null */
+        Data() : mSlot(0), mEnabled(FALSE),
+                 mAttachmentType(NetworkAttachmentType_Null),
+                 mCableConnected(TRUE), mLineSpeed(0), mTraceEnabled(FALSE),
+                 mHostInterface("") /* cannot be null */,
+                 mNATNetwork("") /* cannot be null */
         {}