Additional memset fix for gcc 4.8

(cherry picked from commit 1dd9167393eeb87a31a314b9f4469c5a8bf04a7d)