Changeset 17810 in vbox

Timestamp:

Mar 13, 2009 11:28:51 AM (16 years ago)

Author:

vboxsync

Message:

Main: fix IVirtualBox::GetNextExtraDataKey to accept empty strings as NULL values

File:

• trunk/src/VBox/Main/VirtualBoxImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -1401 +1401 @@
     HRESULT rc = S_OK;
 
+    Bstr bstrInKey(aKey);
+
     /* serialize file access (prevent writes) */
     AutoReadLock alock (this);
@@ -1431 +1433 @@
 
                     /* if we're supposed to return the first one */
-                    if (aKey == NULL)
+                    if (bstrInKey.isEmpty())
                     {
                         key.cloneTo (aNextKey);
@@ -1443 +1445 @@
 
                     /* did we find the key we're looking for? */
-                    if (key == aKey)
+                    if (key == bstrInKey)
                     {
                         ++ it;
@@ -1470 +1472 @@
          * through to return NULLs and S_OK. */
 
-        if (aKey != NULL)
+        if (!bstrInKey.isEmpty())
             return setError (VBOX_E_OBJECT_NOT_FOUND,
-                tr ("Could not find the extra data key '%ls'"), aKey);
+                tr("Could not find the extra data key '%ls'"), bstrInKey.raw());
     }
     catch (...)