ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-01-29 15:43:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge tag '17.0.3'

Browse Source 
Adding check for NULL char pointer before converting to string.
This commit is contained in:
Alex Lin 2016-09-06 13:58:54 -05:00
commit 3be6715eba
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_tree.v_data = &v_data ;
var_set_value( v_data , value) ;
//ref->units = (char *)units ;
ref->units = (char *)(map_trick_units_to_udunits(units).c_str()) ;
if ( units != NULL ) {
ref->units = (char *)(map_trick_units_to_udunits(units).c_str()) ;
} else {
ref->units = (char *)units ;
}
ref_assignment(ref , &v_tree) ;
free(ref) ;
} else {