Changeset 18020 in vbox for trunk/src/VBox/Main/cbinding

Timestamp:

Mar 17, 2009 1:09:10 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

44612

Message:

Cbinding: made change to pass libvirt tests

File:

• trunk/src/VBox/Main/cbinding/VBoxXPCOMCGlue.c (modified) (4 diffs)

trunk/src/VBox/Main/cbinding/VBoxXPCOMCGlue.c

@@ -32 +32 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include "VBoxXPCOMCGlue.h"
+
+#ifdef VBOX_WITH_XPCOM
+# define VIR_ALLOC_N(a, b) ((a) = (char *)malloc(b))
+# define VIR_FREE(name) (free(name))
+#else /* !VBOX_WITH_XPCOM */
+# include <config.h>
+# include "memory.h"
+#endif /* !VBOX_WITH_XPCOM */
+
 #include <stdio.h>
 #include <string.h>
@@ -38 +46 @@
 #include <dlfcn.h>
 
+#include "VBoxXPCOMCGlue.h"
 
 /*******************************************************************************
@@ -80 +89 @@
      */
     cbBuf = cchHome + sizeof("/" DYNLIB_NAME);
-    pszBuf = (char *)malloc(cbBuf);
+    if(VIR_ALLOC_N(pszBuf, cbBuf)) {;}
     if (!pszBuf)
     {
@@ -128 +137 @@
     else
         sprintf(g_szVBoxErrMsg, "dlopen(%.80s): %128s", pszBuf, dlerror());
-    free(pszBuf);
+    VIR_FREE(pszBuf);
     return rc;
 }