Merge pull request #5203 from windpenguin/3.5.x

Fix string subscript out of range when parse command line argument