Commit 37a320dd81db8d546cd24a45b4c61d87b45dcade

eustas 2016-02-04T15:35:44

Fix possible pointer underflow