[ros-diffs] [cgutman] 45284: - Fix a potential buffer overrun and null pointer dereference