Merge pull request #879 from nasa/udunits-bug

get rid of dangling pointer use closes #878
This commit is contained in:
Scott Fennell 2019-10-04 10:25:22 -05:00 committed by GitHub
commit 6625d41a63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,5 +1,6 @@
#include <iostream>
#include <string.h>
#include "trick/VariableServer.hh"
#include "trick/exec_proto.h"
@ -530,11 +531,14 @@ int var_set_base( const char * var , T value , const char * units ) {
v_tree.v_data = &v_data ;
var_set_value( v_data , value) ;
if ( units != NULL ) {
ref->units = (char *)(map_trick_units_to_udunits(units).c_str()) ;
ref->units = strdup(map_trick_units_to_udunits(units).c_str()) ;
} else {
ref->units = (char *)units ;
ref->units = NULL ;
}
ref_assignment(ref , &v_tree) ;
if(ref->units != NULL) {
free(ref->units) ;
}
free(ref) ;
} else {
message_publish(MSG_WARNING,"Cannot assign to %s because io_spec does not allow input\n", var) ;