Changeset 19831

Timestamp:

11/27/15 11:12:48 (9 years ago)

Author:

Eric.Larour

Message:

CHG (JAVASCRIPT): fixed serious segfaults.

Location:

issm/trunk-jpl/src/m/solve

Files:

• WriteData.js (modified) (2 diffs)
• loadresultsfrombuffer.js (modified) (1 diff)
• parseresultsfrombuffer.js (modified) (1 diff)
• solve.js (modified) (1 diff)

issm/trunk-jpl/src/m/solve/WriteData.js

@@ -8 +8 @@
         var args = Array.prototype.slice.call(arguments);
         var options = new pairoptions(args.slice(1,args.length));
+        var enumm;
 
         //Get data properties
@@ -274 +275 @@
         //      enumm=BuildEnum(string)
 
+        var index;
         while( string.indexOf('_') !=-1){
                 index=string.indexOf('_');

issm/trunk-jpl/src/m/solve/loadresultsfrombuffer.js

@@ -14 +14 @@
 
                 //load results onto model
-                var array=parseresultsfrombuffer(buffer,buffersize);
-                if (array.length==0) throw Error('No result found in binary buffer. Check for solution crash.');
-
-
-                md.results[array[0]['SolutionType']] = array;
-                
-                //recover solution_type from results
-                md.priv.solution=array['SolutionType'];
+                return parseresultsfrombuffer(buffer,buffersize);
         }
         else throw Error('loadresultsfrombuffer error message: qmu results not supported yet!');

issm/trunk-jpl/src/m/solve/parseresultsfrombuffer.js

@@ -18 +18 @@
         var check_nomoresteps=0;
         var step    = result['step'];
+        var index;
 
         while (!MapIsEmpty(result)){

issm/trunk-jpl/src/m/solve/solve.js

@@ -189 +189 @@
                         
                 //Load results: 
-                loadresultsfrombuffer(md,outputbuffer,outputbuffersize);
+                var results = loadresultsfrombuffer(md,outputbuffer,outputbuffersize); //loadresults: [array,solution_type]
+
+                return results;
 
         }