averello/vim-mirror
1
0
Fork 0
mirror of https://github.com/vim/vim.git synced 2026-05-28 00:21:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

patch 9.2.0005: Coverity reports unreachable code

Browse Source 
Problem:  Coverity reports unreachable code, CID: 1681310
Solution: Drop the ternary checking for non-NULL of from_encoding_raw.

closes: #19402

Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Christian Brabandt
2026-02-15 16:07:27 +00:00
parent 0435abfaa1
commit e0b10ce95a
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/strings.c
+4 -3
View File
@@ -1469,7 +1469,8 @@ f_blob2str(typval_T *argvars, typval_T *rettv)
vimconv_T vimconv;
vimconv.vc_type = CONV_NONE;
// Use raw encoding name for iconv to preserve endianness (utf-16be vs utf-16)
if (convert_setup_ext(&vimconv, from_encoding_raw ? from_encoding_raw : from_encoding, FALSE, p_enc, FALSE) == FAIL)
// from_encoding_raw is guaranteed non-NULL whenever from_encoding != NULL
if (convert_setup_ext(&vimconv, from_encoding_raw, FALSE, p_enc, FALSE) == FAIL)
{
ga_clear(&blob_ga);
semsg(_(e_str_encoding_from_failed), from_encoding);
@@ -1497,8 +1498,8 @@ f_blob2str(typval_T *argvars, typval_T *rettv)
if (from_encoding != NULL)
{
char_u *converted = convert_string(str,
from_encoding_raw ? from_encoding_raw : from_encoding, p_enc);
// from_encoding_raw is guaranteed non-NULL whenever from_encoding != NULL
char_u *converted = convert_string(str, from_encoding_raw, p_enc);
vim_free(str);
str = converted;
}
src/version.c
+2
View File
@@ -734,6 +734,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
5,
/**/
4,
/**/