Corrected an error in which netgen was trying to reduce an

expression in a property that was not necessarily a parameter,
and if it wasn't, then netgen would crash.  Surfaced by an
example using complicated parameters that netgen was apparently
unable to handle (an issue for another day;  the main goal here
was to avoid a segmentation violation).
This commit is contained in:
R. Timothy Edwards 2025-03-25 17:00:58 -04:00
parent 4f315d33d6
commit bbe645f0ab
2 changed files with 5 additions and 2 deletions

View File

@ -1 +1 @@
1.5.293 1.5.294

View File

@ -2248,7 +2248,10 @@ int PromoteProperty(struct property *prop, struct valuelist *vl,
if (prop == NULL || vl == NULL) return -1; if (prop == NULL || vl == NULL) return -1;
if (prop->type == vl->type) return 1; /* Nothing to do */ if (prop->type == vl->type) return 1; /* Nothing to do */
result = 0; result = 0;
if (prop->type == PROP_EXPRESSION) { /* If vl is an expression but prop is not, then try to reduce
* the expression in vl.
*/
if (vl->type == PROP_EXPRESSION) {
ReduceOneExpression(vl, ob, tc, FALSE); ReduceOneExpression(vl, ob, tc, FALSE);
} }
switch (prop->type) { switch (prop->type) {