Skip to content
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

Jump to bottom

Fix Convert::NativeToInt64 for multiple base conversions #855

Merged
merged 2 commits into from
Sep 15, 2018
Merged

Fix Convert::NativeToInt64 for multiple base conversions #855

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93a4b45
A few tweaks for fixing issue #412: Convert::NativeToInt64 with SUPPO…
MatthiasJentsch Sep 14, 2018
0ecd57e
Merge branch 'develop' into Fix412
MatthiasJentsch Sep 14, 2018
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
22 changes: 21 additions & 1 deletion src/CLR/CorLib/corlib_native_System_Convert.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,29 @@ HRESULT Library_corlib_native_System_Convert::NativeToInt64___STATIC__I8__STRING
long long minValue = stack.Arg2().NumericByRef().s8;
long long maxValue = stack.Arg3().NumericByRef().s8;

// normally we check if the result is in the given range
bool check = true;

// Int64? => use also strtoull the result will be casted to Int64
if (isSigned && maxValue == 0x7FFFFFFFFFFFFFFF) isSigned = false;

// UInt64? => use also strtoull the result will be casted to Int64 and bypass the range check
if (minValue == 0 && maxValue == 0)
{
isSigned = false;
check = false;
}

// convert via strtoll / strtoull
result = isSigned ? strtoll(str, nullptr, radix) : (long long) strtoull(str, nullptr, radix);

stack.SetResult_I8 ((result > maxValue || result < minValue) ? zero : result);
// the signed values for SByte, Int16 and Int32 are always positive for base 2, 8 or 16 conversions
// because the 64-bit function strtoll is used; need the post process the value
// if the result is greater max and smaller (max + 1) * 2 this value should be subtracted
if (isSigned && result > maxValue && result < (maxValue + 1) * 2) result -= (maxValue + 1) * 2;

// for UInt64 the check will be bypassed
stack.SetResult_I8 ((check && (result > maxValue || result < minValue)) ? zero : result);

#else
// support for conversion from base 10 and 16 (partial)
Expand Down