Changeset 60805 in vbox for trunk/src

Timestamp:

May 3, 2016 3:16:13 PM (9 years ago)

Author:

vboxsync

Message:

Main/NATNetwork: fix regression from settings cleanup, have to allow empty name for init and check in a few strategic places

File:

• trunk/src/VBox/Main/src-server/NATNetworkImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-server/NATNetworkImpl.cpp

@@ -115 +115 @@
 HRESULT NATNetwork::init(VirtualBox *aVirtualBox, com::Utf8Str aName)
 {
-    AssertReturn(!aName.isEmpty(), E_INVALIDARG);
-
     AutoInitSpan autoInitSpan(this);
     AssertReturn(autoInitSpan.isOk(), E_FAIL);
@@ -170 +168 @@
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    AssertReturn(!m->s.strNetworkName.isEmpty(), E_FAIL);
     data = m->s;
-    alock.release();
 
     m->pVirtualBox->i_onNATNetworkSetting(Bstr(m->s.strNetworkName).raw(),
@@ -201 +199 @@
 HRESULT NATNetwork::getNetworkName(com::Utf8Str &aNetworkName)
 {
+    AssertReturn(!m->s.strNetworkName.isEmpty(), E_FAIL);
     aNetworkName = m->s.strNetworkName;
     return S_OK;
@@ -207 +206 @@
 HRESULT NATNetwork::setNetworkName(const com::Utf8Str &aNetworkName)
 {
+    if (m->s.strNetworkName.isEmpty())
+        return setError(E_INVALIDARG,
+                        tr("Network name cannot be empty"));
     {
         AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -645 +647 @@
 #ifdef VBOX_WITH_NAT_SERVICE
     if (!m->s.fEnabled) return S_OK;
+    AssertReturn(!m->s.strNetworkName.isEmpty(), E_FAIL);
 
     m->NATRunner.setOption(NetworkServiceRunner::kNsrKeyNetwork, Utf8Str(m->s.strNetworkName).c_str());