ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-20 21:53:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Trick View: Can't set variables with -- units #301

Browse Source 
Test before trying to convert NULL char * to string.
This commit is contained in:
Alex Lin 2016-09-06 13:53:37 -05:00
parent b32015a1ad
commit c4a32600cc
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
trick_source/sim_services/VariableServer/var_server_ext.cpp
View File

@ -525,8 +525,11 @@ int var_set_base( const char * var , T value , const char * units ) {
V_DATA v_data ; V_DATA v_data ;
v_tree.v_data = &v_data ; v_tree.v_data = &v_data ;
var_set_value( v_data , value) ; var_set_value( v_data , value) ;
//ref->units = (char *)units ; if ( units != NULL ) {
ref->units = (char *)(map_trick_units_to_udunits(units).c_str()) ; ref->units = (char *)(map_trick_units_to_udunits(units).c_str()) ;
} else {
ref->units = (char *)units ;
}
ref_assignment(ref , &v_tree) ; ref_assignment(ref , &v_tree) ;
free(ref) ; free(ref) ;
} else { } else {