option: Fix PVS/V547: allocator never returns NULL now

This commit is contained in:
ZyX
2018-04-16 11:33:11 +03:00
parent d66217ab6d
commit 61b6eb926d

View File

@@ -5793,25 +5793,28 @@ void buf_copy_options(buf_T *buf, int flags)
buf->b_p_ro = FALSE; /* don't copy readonly */ buf->b_p_ro = FALSE; /* don't copy readonly */
buf->b_p_fenc = vim_strsave(p_fenc); buf->b_p_fenc = vim_strsave(p_fenc);
switch (*p_ffs) { switch (*p_ffs) {
case 'm': case 'm': {
buf->b_p_ff = vim_strsave((char_u *)FF_MAC); buf->b_p_ff = vim_strsave((char_u *)FF_MAC);
break; break;
case 'd': }
buf->b_p_ff = vim_strsave((char_u *)FF_DOS); case 'd': {
break; buf->b_p_ff = vim_strsave((char_u *)FF_DOS);
case 'u': break;
buf->b_p_ff = vim_strsave((char_u *)FF_UNIX); }
break; case 'u': {
default: buf->b_p_ff = vim_strsave((char_u *)FF_UNIX);
buf->b_p_ff = vim_strsave(p_ff); break;
} }
if (buf->b_p_ff != NULL) { default: {
buf->b_start_ffc = *buf->b_p_ff; buf->b_p_ff = vim_strsave(p_ff);
break;
}
} }
buf->b_p_bh = empty_option; buf->b_p_bh = empty_option;
buf->b_p_bt = empty_option; buf->b_p_bt = empty_option;
} else } else {
free_buf_options(buf, FALSE); free_buf_options(buf, false);
}
buf->b_p_ai = p_ai; buf->b_p_ai = p_ai;
buf->b_p_ai_nopaste = p_ai_nopaste; buf->b_p_ai_nopaste = p_ai_nopaste;