Changeset 18244 in vbox for trunk/src/VBox/Main

Timestamp:

Mar 25, 2009 10:07:16 AM (16 years ago)

Author:

vboxsync

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

44970

Message:

Cbinding: fixed problem due to change using static buffer.

File:

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

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

@@ -32 +32 @@
 *   Header Files                                                               *
 *******************************************************************************/
+#ifdef LIBVIRT_VERSION
+# include <config.h>
+#endif /* LIBVIRT_VERSION */
+
 #include <stdio.h>
 #include <string.h>
@@ -79 +83 @@
     size_t      cbReq;
     char        szBuf[4096];
-    char *      pszBuf;
     int         rc = -1;
 
@@ -91 +94 @@
         return -1;
     }
-    if (pszHome)
-    {
-        memcpy(pszBuf, pszHome, cchHome);
-        pszBuf[cchHome] = '/';
-        cchHome++;
-    }
-    memcpy(&pszBuf[cchHome], DYNLIB_NAME, sizeof(DYNLIB_NAME));
+    memcpy(szBuf, pszHome, cchHome);
+    szBuf[cchHome] = '/';
+    cchHome++;
+    memcpy(&szBuf[cchHome], DYNLIB_NAME, sizeof(DYNLIB_NAME));
 
     /*
@@ -104 +104 @@
      */
     setenv("VBOX_APP_HOME", pszHome, 0 /* no need to overwrite */);
-    g_hVBoxXPCOMC = dlopen(pszBuf, RTLD_NOW | RTLD_LOCAL);
+    g_hVBoxXPCOMC = dlopen(szBuf, RTLD_NOW | RTLD_LOCAL);
     if (g_hVBoxXPCOMC)
     {
@@ -120 +120 @@
             else
                 sprintf(g_szVBoxErrMsg, "%.80s: pfnGetFunctions(%#x) failed",
-                        pszBuf, VBOX_XPCOMC_VERSION);
+                        szBuf, VBOX_XPCOMC_VERSION);
         }
         else
             sprintf(g_szVBoxErrMsg, "dlsym(%.80s/%.32s): %128s",
-                    pszBuf, VBOX_GET_XPCOMC_FUNCTIONS_SYMBOL_NAME, dlerror());
+                    szBuf, VBOX_GET_XPCOMC_FUNCTIONS_SYMBOL_NAME, dlerror());
         if (rc != 0)
         {
@@ -132 +132 @@
     }
     else
-        sprintf(g_szVBoxErrMsg, "dlopen(%.80s): %128s", pszBuf, dlerror());
+        sprintf(g_szVBoxErrMsg, "dlopen(%.80s): %128s", szBuf, dlerror());
     return rc;
 }