Changeset 40361 in vbox

Timestamp:

Mar 5, 2012 4:25:09 PM (13 years ago)

Author:

vboxsync

Message:

GuestProperties/API: never send property change events with NULL strings.

Location:

trunk/src/VBox

Files:

• HostServices/GuestProperties/service.cpp (modified) (1 diff)
• Main/src-server/MachineImpl.cpp (modified) (2 diffs)

trunk/src/VBox/HostServices/GuestProperties/service.cpp

@@ -1148 +1148 @@
         /* Send out a host notification */
         if (RT_SUCCESS(rc))
-            rc = notifyHost(pszProperty, NULL, u64Timestamp, NULL);
+            rc = notifyHost(pszProperty, "", u64Timestamp, "");
     }
     LogFlowThisFunc(("returning\n"));

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

@@ -5352 +5352 @@
             /** @todo r=bird: Why aren't we leaving the lock here?  The
              *                same code in PushGuestProperty does... */
-            mParent->onGuestPropertyChange(mData->mUuid, aName, aValue, aFlags);
+            mParent->onGuestPropertyChange(mData->mUuid, aName,
+                                           aValue ? aValue : Bstr("").raw(),
+                                           aFlags ? aFlags : Bstr("").raw());
         }
     }
@@ -11919 +11921 @@
 
     CheckComArgStrNotEmptyOrNull(aName);
-    CheckComArgMaybeNull(aValue);
-    CheckComArgMaybeNull(aFlags);
+    CheckComArgNotNull(aValue);
+    CheckComArgNotNull(aFlags);
 
     try