fix a bug where the second byte of a potentially empty string can be read
fix a bug where the second byte of a potentially empty string can be read

rhansen/rpstir,rhansen/rpstir,rhansen/rpstir,rhansen/rpstir,rhansen/rpstir