- Move increment of "i" to "increment section" of for loop
 - Protect against writing after end of "buff"(backport from 5.1)