p36850791
/
kinetic-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

roslaunch: #2728 remap validator now checks for empty string

This commit is contained in:
Ken Conley 2010-06-03 21:23:16 +00:00
parent 13ee49b4a0
commit 41c8d77ad1
4 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/test_roslaunch/test/test_xmlloader.py
View File

@ -836,7 +836,9 @@ class TestXmlLoader(unittest.TestCase):
def test_remap_invalid(self):
tests = ['test-remap-invalid-1.xml',
'test-remap-invalid-2.xml',
'test-remap-invalid-2.xml',
'test-remap-invalid-3.xml',
'test-remap-invalid-4.xml',
'test-remap-invalid-name-from.xml',
'test-remap-invalid-name-to.xml',
]

4
test/test_roslaunch/test/xml/test-remap-invalid-3.xml Normal file
View File

@ -0,0 +1,4 @@
<launch>
<!-- to is empty-->
<remap from="from" to="" />
</launch>

4
test/test_roslaunch/test/xml/test-remap-invalid-4.xml Normal file
View File

@ -0,0 +1,4 @@
<launch>
<!-- from is empty -->
<remap from="" to="to" />
</launch>

2
tools/roslaunch/src/roslaunch/loader.py
View File

@ -205,6 +205,8 @@ class LoaderContext(object):
@type remap: (str, str)
"""
remap = [canonicalize_name(x) for x in remap]
if not remap[0] or not remap[1]:
raise RLException("remap from/to attributes cannot be empty")
if not is_legal_name(remap[0]):
raise RLException("remap from [%s] is not a valid ROS name"%remap[0])
if not is_legal_name(remap[1]):