Fixing bug 441923. Stop our SDK sample plugins from crashing on destruction. r+sr=jonas@sicking.cc

modules/plugin/tools/sdk/samples/scriptable/mac/plugin.cpp

@@ -95,8 +95,10 @@ nsPluginInstance::~nsPluginInstance()
   // so releasing it here does not guarantee that it is over
   // we should take precaution in case it will be called later
   // and zero its mPlugin member
-  mScriptablePeer->SetInstance(NULL);
+  if (mScriptablePeer) {
-  NS_IF_RELEASE(mScriptablePeer);
+    mScriptablePeer->SetInstance(NULL);
+    NS_RELEASE(mScriptablePeer);
+  }
 }
 
 NPBool nsPluginInstance::init(NPWindow* aWindow)

modules/plugin/tools/sdk/samples/scriptable/unix/plugin.cpp

@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
@@ -126,8 +126,10 @@ nsPluginInstance::~nsPluginInstance()
   // so releasing it here does not guarantee that it is over
   // we should take precaution in case it will be called later
   // and zero its mPlugin member
-  mScriptablePeer->SetInstance(NULL);
+  if (mScriptablePeer) {
-  NS_IF_RELEASE(mScriptablePeer);
+    mScriptablePeer->SetInstance(NULL);
+    NS_RELEASE(mScriptablePeer);
+  }
 }
 
 static void

modules/plugin/tools/sdk/samples/scriptable/unix/plugin.h

@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *

modules/plugin/tools/sdk/samples/scriptable/windows/plugin.cpp

@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
@@ -93,8 +93,10 @@ nsPluginInstance::~nsPluginInstance()
   // so releasing it here does not guarantee that it is over
   // we should take precaution in case it will be called later
   // and zero its mPlugin member
-  mScriptablePeer->SetInstance(NULL);
+  if (mScriptablePeer) {
-  NS_IF_RELEASE(mScriptablePeer);
+    mScriptablePeer->SetInstance(NULL);
+    NS_RELEASE(mScriptablePeer);
+  }
 }
 
 static LRESULT CALLBACK PluginWinProc(HWND, UINT, WPARAM, LPARAM);

modules/plugin/tools/sdk/samples/scriptable/windows/plugin.h

@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *