Merge pull request #1344 from loganchien/fix-buf-overrun

Fix potential buffer overrun