Changeset 102563 in vbox

Timestamp:

Dec 11, 2023 9:14:20 AM (15 months ago)

Author:

vboxsync

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

160709

Message:

IPRT/http-curl: Added trying to use the dedicated px_proxy_factory_free_proxies() API if available, instead of free'ing stuff ourselves. Only for libproxy >= 0.4.16.

File:

• trunk/src/VBox/Runtime/generic/http-curl.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/generic/http-curl.cpp

@@ -301 +301 @@
 typedef void             (* PFNLIBPROXYFACTORYDTOR)(PLIBPROXYFACTORY);
 typedef char          ** (* PFNLIBPROXYFACTORYGETPROXIES)(PLIBPROXYFACTORY, const char *);
+typedef void             (* PFNLIBPROXYFACTORYFREEPROXIES)(char **);
 #endif
 
@@ -364 +365 @@
 static PFNLIBPROXYFACTORYDTOR                   g_pfnLibProxyFactoryDtor = NULL;
 static PFNLIBPROXYFACTORYGETPROXIES             g_pfnLibProxyFactoryGetProxies = NULL;
+/** Note: Only valid for libproxy >= 0.4.16. */
+static PFNLIBPROXYFACTORYFREEPROXIES            g_pfnLibProxyFactoryFreeProxies = NULL;
 /** @} */
 #endif
@@ -1065 +1068 @@
         if (RT_SUCCESS(rc))
         {
+            /* libproxy < 0.4.16 does not have this function, so this is not fatal if not found. */
+            RTLdrGetSymbol(hMod, "px_proxy_factory_free_proxies", (void **)&g_pfnLibProxyFactoryFreeProxies);
+        }
+        if (RT_SUCCESS(rc))
+        {
             RTMEM_WILL_LEAK(hMod);
             g_hLdrLibProxy = hMod;
@@ -1098 +1106 @@
         {
             char **papszProxies = g_pfnLibProxyFactoryGetProxies(pFactory, pszUrl);
-            g_pfnLibProxyFactoryDtor(pFactory);
             if (papszProxies)
             {
@@ -1120 +1127 @@
                 }
 
-                /* free the result. */
-                for (unsigned i = 0; papszProxies[i]; i++)
-                    free(papszProxies[i]);
-                free(papszProxies);
+                /* Free the result. */
+                if (g_pfnLibProxyFactoryFreeProxies) /* libproxy >= 0.4.16. */
+                {
+                    g_pfnLibProxyFactoryFreeProxies(papszProxies);
+                }
+                else
+                {
+                    for (unsigned i = 0; papszProxies[i]; i++)
+                        free(papszProxies[i]);
+                    free(papszProxies);
+                }
+                papszProxies = NULL;
             }
+
+            g_pfnLibProxyFactoryDtor(pFactory);
         }
     }