Skip to content
Snippets Groups Projects
Commit 5e22062b authored by Xiaohong Bao's avatar Xiaohong Bao
Browse files

fix for SH-2215: [crashhunters] crash at LLPluginClassMedia

parent 13e152c9
No related branches found
No related tags found
No related merge requests found
...@@ -41,16 +41,16 @@ class LLPluginClassMedia : public LLPluginProcessParentOwner ...@@ -41,16 +41,16 @@ class LLPluginClassMedia : public LLPluginProcessParentOwner
LOG_CLASS(LLPluginClassMedia); LOG_CLASS(LLPluginClassMedia);
public: public:
LLPluginClassMedia(LLPluginClassMediaOwner *owner); LLPluginClassMedia(LLPluginClassMediaOwner *owner);
virtual ~LLPluginClassMedia(); ~LLPluginClassMedia();
// local initialization, called by the media manager when creating a source // local initialization, called by the media manager when creating a source
virtual bool init(const std::string &launcher_filename, bool init(const std::string &launcher_filename,
const std::string &plugin_dir, const std::string &plugin_dir,
const std::string &plugin_filename, const std::string &plugin_filename,
bool debug); bool debug);
// undoes everything init() didm called by the media manager when destroying a source // undoes everything init() didm called by the media manager when destroying a source
virtual void reset(); void reset();
void idle(void); void idle(void);
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
class LLPluginInstanceMessageListener class LLPluginInstanceMessageListener
{ {
public: public:
virtual ~LLPluginInstanceMessageListener(); ~LLPluginInstanceMessageListener();
/** Plugin receives message from plugin loader shell. */ /** Plugin receives message from plugin loader shell. */
virtual void receivePluginMessage(const std::string &message) = 0; virtual void receivePluginMessage(const std::string &message) = 0;
}; };
......
...@@ -40,7 +40,8 @@ class LLPluginMessagePipeOwner ...@@ -40,7 +40,8 @@ class LLPluginMessagePipeOwner
LOG_CLASS(LLPluginMessagePipeOwner); LOG_CLASS(LLPluginMessagePipeOwner);
public: public:
LLPluginMessagePipeOwner(); LLPluginMessagePipeOwner();
virtual ~LLPluginMessagePipeOwner(); ~LLPluginMessagePipeOwner();
// called with incoming messages // called with incoming messages
virtual void receiveMessageRaw(const std::string &message) = 0; virtual void receiveMessageRaw(const std::string &message) = 0;
// called when the socket has an error // called when the socket has an error
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
class LLPluginProcessParentOwner class LLPluginProcessParentOwner
{ {
public: public:
virtual ~LLPluginProcessParentOwner(); ~LLPluginProcessParentOwner();
virtual void receivePluginMessage(const LLPluginMessage &message) = 0; virtual void receivePluginMessage(const LLPluginMessage &message) = 0;
virtual bool receivePluginMessageEarly(const LLPluginMessage &message) {return false;}; virtual bool receivePluginMessageEarly(const LLPluginMessage &message) {return false;};
// This will only be called when the plugin has died unexpectedly // This will only be called when the plugin has died unexpectedly
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment