FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simgear/nasal/code.c: fixed conversion of strings to bool.

Browse Source 
We need to check IS_OBJ(r) after IS_STR(r) because all strings are also
objects.

For example this fixes a bug where an empty string evaluated as true.
This commit is contained in:
Julian Smith 2022-03-20 15:04:50 +00:00
parent 3cc7b9a17b
commit de0ab92cca
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
simgear/nasal/code.c
View File

@ -65,13 +65,13 @@ static int boolify(naContext ctx, naRef r)
return naHash_size(r) > 0; return naHash_size(r) > 0;
} }
if (IS_OBJ(r)) return 1;
if(IS_STR(r)) { if(IS_STR(r)) {
double d; double d;
if(naStr_len(r) == 0) return 0; if(naStr_len(r) == 0) return 0;
if(naStr_tonum(r, &d)) return d != 0; if(naStr_tonum(r, &d)) return d != 0;
else return 1; else return 1;
} }
if (IS_OBJ(r)) return 1;
ERR(ctx, "non-scalar used in boolean context"); ERR(ctx, "non-scalar used in boolean context");
return 0; return 0;
} }