handle node names which are null #177
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sloretz
reviewed
Feb 2, 2018
rclpy/src/rclpy/_rclpy.c
Outdated
| @@ -2320,7 +2320,8 @@ rclpy_get_node_names(PyObject * Py_UNUSED(self), PyObject * args) | |||
| size_t idx; | |||
| for (idx = 0; idx < node_names.size; ++idx) { | |||
| PyList_SetItem( | |||
| pynode_names, idx, PyUnicode_FromString(node_names.data[idx])); | |||
| pynode_names, idx, PyUnicode_FromString( | |||
| node_names.data[idx] ? node_names.data[idx] : "")); | |||
There was a problem hiding this comment.
Is there a difference between a null pointer and an empty string coming from rcl_get_node_names()? If so, maybe this should return Py_None instead.
There was a problem hiding this comment.
Absolutely. Updated the patch to use Py_None.
dirk-thomas
force-pushed
the
node_name_in_user_data
branch
from
6028605 to
f2d08db
Compare
sloretz
reviewed
Feb 2, 2018
rclpy/src/rclpy/_rclpy.c
Outdated
| PyList_SetItem( | ||
| pynode_names, idx, PyUnicode_FromString(node_names.data[idx])); | ||
| pynode_names, idx, name ? PyUnicode_FromString(name) : Py_None); |
There was a problem hiding this comment.
I think Py_INCREF(Py_None) is needed here since PyList_SetItem steals a reference.
There was a problem hiding this comment.
Thank you for catching this (again). Fixed in 9135c1c. Please feel free to point out the third flaw 😉
dirk-thomas
force-pushed
the
node_name_in_user_data
branch
from
f2d08db to
9135c1c
Compare
sloretz
approved these changes
Feb 2, 2018
dirk-thomas
force-pushed
the
node_name_in_user_data
branch
from
9135c1c to
9b60f4e
Compare
dirk-thomas
force-pushed
the
node_name_in_user_data
branch
from
9b60f4e to
e3eace5
Compare
dirk-thomas
force-pushed
the
node_name_in_user_data
branch
from
e3eace5 to
fd1221d
Compare
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Necessary since each item can potentially contain a
nullptr.Connect to ros2/ros2#438.