fix potential read of uninitialized memory and/or buffer overflow
fix potential read of uninitialized memory and/or buffer overflow

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