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 for incorrect integer value conversion on Windows #1126

Merged
merged 2 commits into from Dec 21, 2023
Merged

Fix for incorrect integer value conversion on Windows #1126

merged 2 commits into from Dec 21, 2023

Conversation

MichaelOrlov
Copy link
Contributor

RCA

It turns out that we are using ival = strtol(value, &endptr, 0); function when trying to parse integer value.
On Linux and 64-bit, it works correctly for values bigger than LONG_MAX = 2147483647 because sizeof(long) returns
8 bytes. However on Windows, it is not true and sizeof(long) is 4 bytes and strtol(value, &endptr, 0) can't parse values bigger than 2147483647 and we fallback to the parsing value as a floating point value with strtod(..) and it succeeds.

FIX

  1. Replaced strtol(..) with strtoll(..)
  2. Adjust values in the unit test to cover this use-case.

@MichaelOrlov
Fix for incorrect integer value conversion on Windows
15ada32 
- Replace srtol(..) to the strtoll(..)

Signed-off-by: Michael Orlov <michael.orlov@apex.ai>
clalancette
clalancette requested changes Dec 11, 2023
View reviewed changes
Copy link
Contributor

@clalancette clalancette left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One small change, this otherwise looks good to me.

rcl_yaml_param_parser/src/parse.c Outdated Show resolved Hide resolved
@MichaelOrlov @clalancette
Remove extra check for NULL != endptr per review request
bef8bd1 
Co-authored-by: Chris Lalancette <clalancette@gmail.com>

Co-authored-by: Chris Lalancette <clalancette@gmail.com>
Signed-off-by: Michael Orlov <morlovmr@gmail.com>
clalancette
clalancette approved these changes Dec 11, 2023
View reviewed changes
Copy link
Contributor

@clalancette clalancette left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me with green CI.

@MichaelOrlov
Copy link
Contributor Author

Gist: https://gist.githubusercontent.com/MichaelOrlov/2b6b58cb449fe2da0a220b18bca964cd/raw/df8f73acff15d43f9ecad2ac4c5d1920b013a47a/ros2.repos
BUILD args: --packages-above-and-dependencies rcl_yaml_param_parser
TEST args: --packages-above rcl_yaml_param_parser
ROS Distro: rolling
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/13038

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Windows Build Status

fujitatomoya
fujitatomoya approved these changes Dec 11, 2023
View reviewed changes
Copy link
Collaborator

@fujitatomoya fujitatomoya left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, @MichaelOrlov thanks!

@fujitatomoya
Copy link
Collaborator

Note

we would want to backport this to iron and humble.

@clalancette clalancette merged commit 7bcc293 into ros2:rolling Dec 21, 2023
2 of 3 checks passed
@clalancette
Copy link
Contributor

@Mergifyio backport humble iron

@mergify Mergify
Copy link

mergify bot commented Dec 21, 2023 •
edited

backport humble iron

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Dec 21, 2023
@MichaelOrlov @mergify
Fix for incorrect integer value conversion on Windows (#1126)
5119d70 
* Fix for incorrect integer value conversion on Windows

- Replace srtol(..) to the strtoll(..)

Signed-off-by: Michael Orlov <michael.orlov@apex.ai>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
(cherry picked from commit 7bcc293)
mergify bot pushed a commit that referenced this pull request Dec 21, 2023
@MichaelOrlov @mergify
Fix for incorrect integer value conversion on Windows (#1126)
60a749f 
* Fix for incorrect integer value conversion on Windows

- Replace srtol(..) to the strtoll(..)

Signed-off-by: Michael Orlov <michael.orlov@apex.ai>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
(cherry picked from commit 7bcc293)
This was referenced Dec 21, 2023
Merged
Merged
clalancette pushed a commit that referenced this pull request Jan 4, 2024
@mergify @MichaelOrlov
Fix for incorrect integer value conversion on Windows (#1126) (#1129)
69a9fce 
* Fix for incorrect integer value conversion on Windows

- Replace srtol(..) to the strtoll(..)

Signed-off-by: Michael Orlov <michael.orlov@apex.ai>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
(cherry picked from commit 7bcc293)

Co-authored-by: Michael Orlov <morlovmr@gmail.com>
clalancette pushed a commit that referenced this pull request Jan 4, 2024
@mergify @MichaelOrlov
Fix for incorrect integer value conversion on Windows (#1126) (#1128)
a47bd72 
* Fix for incorrect integer value conversion on Windows

- Replace srtol(..) to the strtoll(..)

Signed-off-by: Michael Orlov <michael.orlov@apex.ai>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
(cherry picked from commit 7bcc293)

Co-authored-by: Michael Orlov <morlovmr@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@clalancette clalancette clalancette approved these changes

@fujitatomoya fujitatomoya fujitatomoya approved these changes

@audrow audrow Awaiting requested review from audrow audrow is a code owner

@ivanpauno ivanpauno Awaiting requested review from ivanpauno ivanpauno is a code owner

@wjwwood wjwwood Awaiting requested review from wjwwood wjwwood is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

rcl_yaml_param_parser incorrectly parsing integer values bigger than LONG_MAX = 2147483647
3 participants
@MichaelOrlov @fujitatomoya @clalancette