Merge pull request #767 from julienmalik/fix_memset_null_pointer