Fix bugs in Octave module loading

CHANGES.current

@@ -5,6 +5,11 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 2.0.10 (in progress)
 ============================
 
+2013-05-09: kwwette
+            [Octave] Fix bugs in Octave module loading:
+            - fix a memory leak in setting of global variables
+            - install functions only once, to speed up module loads
+
 2013-04-28: gjanssens
             [Guile] Updates in guile module:
             - Add support for guile 2.0

Lib/octave/octrun.swg

@@ -1289,16 +1289,7 @@ SWIGRUNTIMEINLINE octave_value SWIG_Octave_GetGlobalValue(std::string name) {
 }
 
 SWIGRUNTIME void SWIG_Octave_SetGlobalValue(std::string name, const octave_value& value) {
-  // It is critical that a newly-allocated octave_value is passed to set_global_value(),
-  // since it and the Octave symbol table take references to the values assigned to it.
-  // If we were to pass a reference to 'value' to set_global_value(), then the Octave
-  // symbol table would hold a reference to a variable owned by the SWIG .oct module.
-  // Both will think that they own the reference (since the .oct module is dynamically
-  // loaded, it appears to have its own C++ runtime), and so they will both try to
-  // de-allocate the octave_value on exit, resulting in a double-free or seg-fault.
-  // This is prevented by giving Octave its own heap-allocated copy of 'value'.
-  octave_value *pov = new octave_value(value);
-  set_global_value(name, *pov);
+  set_global_value(name, value);
 }
 
 SWIGRUNTIME void SWIG_Octave_LinkGlobalValue(std::string name) {

Lib/octave/octruntime.swg

@@ -288,6 +288,15 @@ DEFUN_DLD( SWIG_name, args, nargout, SWIG_name_usage ) {
 
     SWIG_InstallOps(octave_swig_ref::static_type_id());
 
+    octave_swig_type::swig_member_const_iterator mb;
+    for (mb = module_ns->swig_members_begin(); mb != module_ns->swig_members_end(); ++mb) {
+      if (mb->second.first && mb->second.first->method) {
+        if (!SWIG_Octave_InstallFunction(me, mb->first)) {
+          return octave_value_list();
+        }
+      }
+    }
+
 #if OCTAVE_API_VERSION_NUMBER < 37
     mlock(me->name());
 #else
@@ -296,16 +305,9 @@ DEFUN_DLD( SWIG_name, args, nargout, SWIG_name_usage ) {
 
   }
 
-  octave_function *me = octave_call_stack::current();
-
   octave_swig_type::swig_member_const_iterator mb;
   for (mb = module_ns->swig_members_begin(); mb != module_ns->swig_members_end(); ++mb) {
-    if (mb->second.first && mb->second.first->method) {
-      if (!SWIG_Octave_InstallFunction(me, mb->first)) {
-        return octave_value_list();
-      }
-    }
-    else if (mb->second.second.is_defined()) {
+    if (mb->second.second.is_defined()) {
       SWIG_Octave_SetGlobalValue(mb->first, mb->second.second);
       SWIG_Octave_LinkGlobalValue(mb->first);
     }