Changeset 28972 in vbox for trunk/src/VBox/Additions

Timestamp:

May 3, 2010 12:25:23 PM (15 years ago)

Author:

vboxsync

Message:

VBoxService/PropCache: Bugfixes.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.cpp

@@ -95 +95 @@
     va_list va;
     va_start(va, pszValueFormat);
-    int rc = VBoxServicePropCacheUpdate(pCache, pszName, 0 /* Not used */, NULL /* Not used */, pszValueFormat, va);
+    char *pszValue;
+    int rc = RTStrAPrintfV(&pszValue, pszValueFormat, va);
+    if (RT_SUCCESS(rc))
+    {
+        rc = VBoxServicePropCacheUpdateEx(pCache, pszName, 0 /* Not used */, NULL /* Not used */, pszValue);
+        RTStrFree(pszValue);
+    }
     va_end(va);
     return rc;
@@ -137 +143 @@
             if (pNode->uFlags & VBOXSERVICEPROPCACHEFLAG_ALWAYS_UPDATE)
                 fUpdate = true;
-            else if (strcmp(pNode->pszValue, pszValue) != 0)
+            else if (pNode->pszValue && strcmp(pNode->pszValue, pszValue) != 0)
                 fUpdate = true;
 
@@ -170 +176 @@
     {
         PVBOXSERVICEVEPROPCACHEENTRY pNewNode = (PVBOXSERVICEVEPROPCACHEENTRY)RTMemAlloc(sizeof(VBOXSERVICEVEPROPCACHEENTRY));
-        pNode->pszName = RTStrDup(pszName);
+        pNewNode->pszName = RTStrDup(pszName);
         if (pszValue)
-            pNode->pszValue = RTStrDup(pszValue);
+            pNewNode->pszValue = RTStrDup(pszValue);
         else
-            pNode->pszValue = NULL;
+            pNewNode->pszValue = NULL;
          if (pszValueReset)
-            pNode->pszValueReset = RTStrDup(pszValueReset);
+            pNewNode->pszValueReset = RTStrDup(pszValueReset);
         else
-            pNode->pszValueReset = NULL;
+            pNewNode->pszValueReset = NULL;
         pNewNode->uFlags = u32Flags;
         /*rc =*/ RTListAppend(&pCache->Node, &pNewNode->Node);