Merge branch 'master' into netgen-1.5

Corrected a potential crash condition while doing series combination.
2026-08-27 08:26:49 +02:00 · 2021-01-09 03:00:32 -05:00 · 2021-01-08 09:55:00 -05:00
2 changed files with 3 additions and 3 deletions
@@ -1 +1 @@
-1.5.161
+1.5.162
@@ -3584,8 +3584,8 @@ int CombineSeries(char *model, int file)

 	    /* Excise the 2nd instance.  instlist[i][1] remains as the	*/
 	    /* only pointer to it.					*/
-            for (obp = instlist[i][0]; obp->next->type > FIRSTPIN ||
-			obp->next->type == PROPERTY; obp = obp->next);
+            for (obp = instlist[i][0]; obp->next && (obp->next->type > FIRSTPIN ||
+			obp->next->type == PROPERTY); obp = obp->next);
            for (ob2 = obp; ob2 && ob2->next != instlist[i][1]; ob2 = ob2->next);

 	    /* Device may have been moved by the above code.  If so, look for	*/
Author	SHA1	Message	Date
Tim Edwards	3fe3bc4cfa	Merge branch 'master' into netgen-1.5	2021-01-09 03:00:32 -05:00
Tim Edwards	f3cebd9099	Corrected a potential crash condition while doing series combination.	2021-01-08 09:55:00 -05:00
@@ -1 +1 @@
 .5.161
 .5.162