Changeset 40837

Timestamp:

Jul 19, 2019, 5:32:31 PM (7 years ago)

Author:

eugene

Message:

do not allow splines with < 3 pts

Location:

branches/eam_branches/ohana.20190329/src/opihi/lib.data

Files:

• SplineOps.c (modified) (1 diff)
• spline.c (modified) (2 diffs)

branches/eam_branches/ohana.20190329/src/opihi/lib.data/SplineOps.c

@@ -41 +41 @@
     ALLOCATE (spline[0].y2, opihi_flt, spline[0].Nknots);
   }
-  memset (spline[0].xk, 0, spline[0].Nknots * sizeof(opihi_flt));
-  memset (spline[0].yk, 0, spline[0].Nknots * sizeof(opihi_flt));
-  memset (spline[0].y2, 0, spline[0].Nknots * sizeof(opihi_flt));
+  if (spline[0].Nknots) {
+    memset (spline[0].xk, 0, spline[0].Nknots * sizeof(opihi_flt));
+    memset (spline[0].yk, 0, spline[0].Nknots * sizeof(opihi_flt));
+    memset (spline[0].y2, 0, spline[0].Nknots * sizeof(opihi_flt));
+  }
 }
 

branches/eam_branches/ohana.20190329/src/opihi/lib.data/spline.c

@@ -7 +7 @@
   float dy, dx, *tmp;
   
+  // spline is not valid with < 3 points
+  if (N < 3) return;
+
   ALLOCATE (tmp, float, N);
 
@@ -69 +72 @@
   opihi_flt dy, dx, *tmp;
   
+  // spline is not valid with < 3 points
+  if (N < 3) return;
+
   ALLOCATE (tmp, opihi_flt, N);