Skip to content

Fix null convertion in Num::fromString (#1131) #1132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix null convertion in Num::fromString (#1131) #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/vm/wren_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,11 +618,14 @@ DEF_PRIMITIVE(num_fromString)
char* end;
double number = strtod(string->value, &end);

if (errno == ERANGE) RETURN_ERROR("Number literal is too large.");

// Check for no conversion.
if (number == 0.0 && string->value == end) RETURN_NULL;

// Skip past any trailing whitespace.
while (*end != '\0' && isspace((unsigned char)*end)) end++;

if (errno == ERANGE) RETURN_ERROR("Number literal is too large.");

// We must have consumed the entire string. Otherwise, it contains non-number
// characters and we can't parse it.
if (end < string->value + string->length) RETURN_NULL;
Expand Down
1 change: 1 addition & 0 deletions test/core/number/from_string.wren
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ System.print(Num.fromString(" 12 ") == 12) // expect: true
// Test some non-number literals and ensure they return null.
System.print(Num.fromString("test1") == null) // expect: true
System.print(Num.fromString("") == null) // expect: true
System.print(Num.fromString(" ") == null) // expect: true
System.print(Num.fromString("prefix1.2") == null) // expect: true
System.print(Num.fromString("1.2suffix") == null) // expect: true

Expand Down