[Kst] branches/work/kst/1.6/kst/src/extensions/js

[Andrew Walker]

SVN commit 731510 by arwalker:

BUG:151654 prevent crash in JavaScript

 M  +4 -3      bind_plugin.cpp  
 M  +1 -3      bind_pluginmodule.cpp  


--- branches/work/kst/1.6/kst/src/extensions/js/bind_plugin.cpp #731509:731510
@@ -166,7 +166,7 @@
       return (this->*pluginProperties[i].get)(exec);
     }
   }
-  
+
   return KstBindDataObject::get(exec, propertyName);
 }
 
@@ -210,7 +210,9 @@
   KstCPluginPtr d = makePlugin(_d);
   if (d) {
     KstReadLocker rl(d);
-    return KJS::Object(new KstBindPluginModule(exec, d->plugin()->data()));
+    if (d->plugin()) {
+      return KJS::Object(new KstBindPluginModule(exec, d->plugin()->data()));
+    }
   }
   return KJS::Null();
 }
@@ -256,4 +258,3 @@
 
 #undef makePlugin
 
-// vim: ts=2 sw=2 et
--- branches/work/kst/1.6/kst/src/extensions/js/bind_pluginmodule.cpp #731509:731510
@@ -118,7 +118,7 @@
       return (this->*pluginModuleProperties[i].get)(exec);
     }
   }
-  
+
   return KstBinding::get(exec, propertyName);
 }
 
@@ -207,5 +207,3 @@
   return KJS::Object(new KstBindPluginIOCollection(exec, _d._outputs, false));
 }
 
-
-// vim: ts=2 sw=2 et