Fix out-of-bounds write

mentioned in commit a8ac8f61

mentioned in commit e2e46f5f

mentioned in commit 2304c606

mentioned in commit 09451990

mentioned in commit a39f9818

mentioned in commit e463301a

mentioned in commit fb2eb861

mentioned in commit e6bd186c

mentioned in commit 0dd00d9b

mentioned in commit 827e1208

mentioned in commit 034987c1