glsl2: strdup the field names used in dereference_record.
Otherwise, after linking and freeing the old data, the pointer would dangle. Partial fix for glsl1-struct*.
This commit is contained in:
@@ -514,7 +514,7 @@ ir_dereference_record::ir_dereference_record(ir_rvalue *value,
|
|||||||
{
|
{
|
||||||
this->ir_type = ir_type_dereference_record;
|
this->ir_type = ir_type_dereference_record;
|
||||||
this->record = value;
|
this->record = value;
|
||||||
this->field = field;
|
this->field = talloc_strdup(this, field);
|
||||||
this->type = (this->record != NULL)
|
this->type = (this->record != NULL)
|
||||||
? this->record->type->field_type(field) : glsl_type::error_type;
|
? this->record->type->field_type(field) : glsl_type::error_type;
|
||||||
}
|
}
|
||||||
@@ -527,7 +527,7 @@ ir_dereference_record::ir_dereference_record(ir_variable *var,
|
|||||||
|
|
||||||
this->ir_type = ir_type_dereference_record;
|
this->ir_type = ir_type_dereference_record;
|
||||||
this->record = new(ctx) ir_dereference_variable(var);
|
this->record = new(ctx) ir_dereference_variable(var);
|
||||||
this->field = field;
|
this->field = talloc_strdup(this, field);
|
||||||
this->type = (this->record != NULL)
|
this->type = (this->record != NULL)
|
||||||
? this->record->type->field_type(field) : glsl_type::error_type;
|
? this->record->type->field_type(field) : glsl_type::error_type;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user