VUL: add some more buffer checks