[ros-diffs] [cgutman] 35343: - Fix a possible crash - Fix 2 memory leaks