Changeset 24637 in vbox for trunk/src

Timestamp:

Nov 13, 2009 1:29:24 PM (15 years ago)

Author:

vboxsync

Message:

xpcom: prevent valgrind warning

Location:

trunk/src/libs/xpcom18a4

Files:

• ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp (modified) (1 diff)
• xpcom/reflect/xptcall/public/xptcall.h (modified) (1 diff)

trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp

@@ -665 +665 @@
 FinishParam(nsXPTCVariant &v)
 {
+#ifdef VBOX
+  /* make valgrind happy */
+  if (!v.MustFreeVal())
+    return;
+#endif
   if (!v.val.p)
     return;

trunk/src/libs/xpcom18a4/xpcom/reflect/xptcall/public/xptcall.h

@@ -159 +159 @@
     PRBool IsValUTF8String() const  {return 0 != (flags & VAL_IS_UTF8STR);}
     PRBool IsValCString()    const  {return 0 != (flags & VAL_IS_CSTR);}    
+#ifdef VBOX
+    PRBool MustFreeVal()     const  {return 0 != (flags & (  VAL_IS_ALLOCD
+                                                           | VAL_IS_IFACE
+                                                           | VAL_IS_DOMSTR
+                                                           | VAL_IS_UTF8STR
+                                                           | VAL_IS_CSTR)); }
+#endif
 
     void Init(const nsXPTCMiniVariant& mv, const nsXPTType& t, PRUint8 f)