comparison plugin/FeatureExtractionPluginFactory.cpp @ 980:6e6da0636e5e tonioni

Merge from default branch
author Chris Cannam
date Tue, 09 Sep 2014 16:36:21 +0100
parents 7aa9088e9bcd
children a1cd5abcb38b
comparison
equal deleted inserted replaced
954:35b05cac32d0 980:6e6da0636e5e
46 { 46 {
47 // see notes in vamp-sdk/hostext/PluginLoader.cpp from which this is drawn 47 // see notes in vamp-sdk/hostext/PluginLoader.cpp from which this is drawn
48 Vamp::Plugin *p = m_plugin; 48 Vamp::Plugin *p = m_plugin;
49 delete m_plugin; 49 delete m_plugin;
50 m_plugin = 0; 50 m_plugin = 0;
51 // acceptable use after free here, as pluginDeleted uses p only as
52 // pointer key and does not deref it
51 if (m_factory) m_factory->pluginDeleted(p); 53 if (m_factory) m_factory->pluginDeleted(p);
52 } 54 }
53 55
54 static FeatureExtractionPluginFactory *_nativeInstance = 0; 56 static FeatureExtractionPluginFactory *_nativeInstance = 0;
55 57