Hmph, github doesn't let me comment on a nearby line that wasn't part of this commit. 
But, a few lines above, when you're parsing cmdStr and argStr, you shoul duse SplitStringIntoTokensOnDelimiter() and ASSERT that the size of the returned vector is 2 or something appropriate.