儲存庫 vbox 的更動 18221

時間撮記:

2009-3-24 下午07:35:24 (16 年 以前)

作者:

vboxsync

訊息:

VBoxXPCOMCGlue.c: Drop the malloc/free and use a 4KB static path buffer instead. This mess less mess.

檔案:

• trunk/src/VBox/Main/cbinding/VBoxXPCOMCGlue.c (修改) (5 筆差異)

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

@@ -31 +31 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#ifndef VBOX_WITH_XPCOM /** @todo Find libvirt define to test for! */
-# include <config.h>
-# include "memory.h"
-#endif /* !VBOX_WITH_XPCOM */
-
 #include <stdio.h>
 #include <string.h>
@@ -57 +52 @@
 #endif
 
-#ifdef VBOX_WITH_XPCOM /** @todo Find libvirt define to test for! */
-# define VIR_ALLOC_N(a, b) ((a) = (char *)malloc(b))
-# define VIR_FREE(name) (free(name))
-#endif /* !VBOX_WITH_XPCOM */
-
 
 /*******************************************************************************
@@ -86 +76 @@
 {
     size_t      cchHome = pszHome ? strlen(pszHome) : 0;
-    size_t      cbBuf;
+    size_t      cbReq;
+    char        szBuf[4096];
     char *      pszBuf;
     int         rc = -1;
@@ -93 +84 @@
      * Construct the full name.
      */
-    cbBuf = cchHome + sizeof("/" DYNLIB_NAME);
-    if(VIR_ALLOC_N(pszBuf, cbBuf)) {;}
-    if (!pszBuf)
-    {
-        sprintf(g_szVBoxErrMsg, "malloc(%u) failed", (unsigned)cbBuf);
+    cbReq = cchHome + sizeof("/" DYNLIB_NAME);
+    if (cbReq > sizeof(szBuf))
+    {
+        sprintf(g_szVBoxErrMsg, "path buffer too small: %u bytes required", (unsigned)cbReq);
         return -1;
     }
@@ -142 +132 @@
     else
         sprintf(g_szVBoxErrMsg, "dlopen(%.80s): %128s", pszBuf, dlerror());
-    VIR_FREE(pszBuf);
     return rc;
 }