comparison src/vamp-sdk/PluginAdapter.cpp @ 467:bd8484e19353 vampipe

Fix long-standing memory leaks (parameter descriptors and feature list container) in plugin adapter

 #ifdef DEBUG_PLUGIN_ADAPTER
     std::cerr << "PluginAdapterBase::Impl[" << this << "]::getDescriptor" << std::endl;
 #endif
 
     if (m_populated) return &m_descriptor;
-
+    
     Plugin *plugin = m_base->createPlugin(48000);
   
     if (!plugin) {
         std::cerr << "PluginAdapterBase::Impl::getDescriptor: Failed to create plugin" << std::endl;
         return 0;

             for (unsigned int j = 0; desc->valueNames[j]; ++j) {
                 free((void *)desc->valueNames[j]);
             }
             free((void *)desc->valueNames);
         }
+        free((void *)desc);
     }
     free((void *)m_descriptor.parameters);
 
     for (unsigned int i = 0; i < m_descriptor.programCount; ++i) {
         free((void *)m_descriptor.programs[i]);

     if (m_fs.find(plugin) != m_fs.end()) {
         size_t outputCount = 0;
         if (m_pluginOutputs[plugin]) {
             outputCount = m_pluginOutputs[plugin]->size();
         }
+        std::cerr << "cleanup: " << outputCount << " output(s)" << std::endl;
         VampFeatureList *list = m_fs[plugin];
         for (unsigned int i = 0; i < outputCount; ++i) {
             for (unsigned int j = 0; j < m_fsizes[plugin][i]; ++j) {
                 if (list[i].features[j].v1.label) {
                     free(list[i].features[j].v1.label);

                     free(list[i].features[j].v1.values);
                 }
             }
             if (list[i].features) free(list[i].features);
         }
+        if (list) free((void *)list);
         m_fs.erase(plugin);
         m_fsizes.erase(plugin);
         m_fvsizes.erase(plugin);
     }
 

 }
 
 void
 PluginAdapterBase::Impl::resizeFS(Plugin *plugin, int n)
 {
-//    std::cerr << "PluginAdapterBase::Impl::resizeFS(" << plugin << ", " << n << ")" << std::endl;
+#ifdef DEBUG_PLUGIN_ADAPTER
+    std::cerr << "PluginAdapterBase::Impl::resizeFS(" << plugin << ", " << n << ")" << std::endl;
+#endif
 
     int i = m_fsizes[plugin].size();
     if (i >= n) return;
 
-//    std::cerr << "resizing from " << i << std::endl;
+#ifdef DEBUG_PLUGIN_ADAPTER
+    std::cerr << "resizing from " << i << std::endl;
+#endif
 
     m_fs[plugin] = (VampFeatureList *)realloc
         (m_fs[plugin], n * sizeof(VampFeatureList));
 
     while (i < n) {

 }
 
 void
 PluginAdapterBase::Impl::resizeFL(Plugin *plugin, int n, size_t sz)
 {
-//    std::cerr << "PluginAdapterBase::Impl::resizeFL(" << plugin << ", " << n << ", "
-//              << sz << ")" << std::endl;
-
+#ifdef DEBUG_PLUGIN_ADAPTER
+    std::cerr << "PluginAdapterBase::Impl::resizeFL(" << plugin << ", " << n << ", "
+              << sz << ")" << std::endl;
+#endif
+    
     size_t i = m_fsizes[plugin][n];
     if (i >= sz) return;
 
-//    std::cerr << "resizing from " << i << std::endl;
+#ifdef DEBUG_PLUGIN_ADAPTER
+    std::cerr << "resizing from " << i << std::endl;
+#endif
 
     m_fs[plugin][n].features = (VampFeatureUnion *)realloc
         (m_fs[plugin][n].features, 2 * sz * sizeof(VampFeatureUnion));
 
     while (m_fsizes[plugin][n] < sz) {

 }
 
 void
 PluginAdapterBase::Impl::resizeFV(Plugin *plugin, int n, int j, size_t sz)
 {
-//    std::cerr << "PluginAdapterBase::Impl::resizeFV(" << plugin << ", " << n << ", "
-//              << j << ", " << sz << ")" << std::endl;
-
+#ifdef DEBUG_PLUGIN_ADAPTER
+    std::cerr << "PluginAdapterBase::Impl::resizeFV(" << plugin << ", " << n << ", "
+              << j << ", " << sz << ")" << std::endl;
+#endif
+    
     size_t i = m_fvsizes[plugin][n][j];
     if (i >= sz) return;
 
-//    std::cerr << "resizing from " << i << std::endl;
-
+#ifdef DEBUG_PLUGIN_ADAPTER
+    std::cerr << "resizing from " << i << std::endl;
+#endif
+    
     m_fs[plugin][n].features[j].v1.values = (float *)realloc
         (m_fs[plugin][n].features[j].v1.values, sz * sizeof(float));
 
     m_fvsizes[plugin][n][j] = sz;
 }