comparison vamp-sdk/PluginHostAdapter.cpp @ 7:c66551966b5f

* Fix a couple of memory management and corruption bugs
* Some textual fixes

         d.description = sd->description;
         d.unit = sd->unit;
         d.hasFixedValueCount = sd->hasFixedValueCount;
         d.valueCount = sd->valueCount;
         for (unsigned int j = 0; j < sd->valueCount; ++j) {
-            d.valueNames.push_back(sd->valueNames[i] ? sd->valueNames[i] : "");
+            d.valueNames.push_back(sd->valueNames[j] ? sd->valueNames[j] : "");
         }
         d.hasKnownExtents = sd->hasKnownExtents;
         d.minValue = sd->minValue;
         d.maxValue = sd->maxValue;
         d.isQuantized = sd->isQuantized;

 
 void
 PluginHostAdapter::convertFeatures(VampFeatureList **features,
                                    FeatureSet &fs)
 {
+    if (!features) return;
+
     for (unsigned int i = 0; features[i]; ++i) {
         
         VampFeatureList &list = *features[i];
 
         if (list.featureCount > 0) {

                                              list.features[j].nsec);
 
                 for (unsigned int k = 0; k < list.features[j].valueCount; ++k) {
                     feature.values.push_back(list.features[j].values[k]);
                 }
-                
-                feature.label = list.features[j].label;
+
+                if (list.features[j].label) {
+                    feature.label = list.features[j].label;
+                }
 
                 fs[i].push_back(feature);
             }
         }
     }