aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-08-29 20:33:37 -04:00
Code

patch 9.1.1144: no way to create raw strings from a blob

Browse Source 
Problem:  no way to create raw strings from a blob
Solution: support the "encoding": "none" option
          to create raw strings (which may be invalid!)
          (Bakudankun)

closes: #16666

Signed-off-by: Bakudankun <bakudankun@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Bakudankun 2025-02-23 20:29:21 +01:00 committed by Christian Brabandt
parent e0029daa35
commit b3854bfc54
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
4 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
runtime/doc/builtin.txt
View File

@ -1,4 +1,4 @@
*builtin.txt* For Vim version 9.1. Last change: 2025 Feb 17 *builtin.txt* For Vim version 9.1. Last change: 2025 Feb 23
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -1309,10 +1309,14 @@ blob2str({blob} [, {options}]) *blob2str()*
items: items:
encoding Decode the bytes in {blob} using this encoding Decode the bytes in {blob} using this
encoding. The value is a |String|. See encoding. The value is a |String|. See
|encoding-names| for the supported values. |encoding-names| for the supported values
(plus the special value "none").
*E1515* *E1515*
An error is given and an empty List is returned if When current 'encoding' is "utf-8", an error is given and an
an invalid byte sequence is encountered in {blob}, empty List is returned if an invalid byte sequence is
encountered in {blob}. To suppress this validation and get
potentially invalid string, set "encoding" in {options} to
"none".
Returns an empty List if blob is empty. Returns an empty List if blob is empty.
@ -10645,7 +10649,8 @@ str2blob({list} [, {options}]) *str2blob()*
The argument {options} is a |Dict| and supports the following The argument {options} is a |Dict| and supports the following
items: items:
encoding Encode the characters using this encoding. encoding Convert the characters using this encoding
before making the Blob.
The value is a |String|. See |encoding-names| The value is a |String|. See |encoding-names|
for the supported values. for the supported values.

13
src/strings.c
View File

@ -1289,7 +1289,7 @@ f_blob2str(typval_T *argvars, typval_T *rettv)
blob_T *blob; blob_T *blob;
int blen; int blen;
long idx; long idx;
int utf8_inuse = FALSE; int validate_utf8 = FALSE;
if (check_for_blob_arg(argvars, 0) == FAIL if (check_for_blob_arg(argvars, 0) == FAIL
|| check_for_opt_dict_arg(argvars, 1) == FAIL) || check_for_opt_dict_arg(argvars, 1) == FAIL)
@ -1316,7 +1316,14 @@ f_blob2str(typval_T *argvars, typval_T *rettv)
} }
if (STRCMP(p_enc, "utf-8") == 0 || STRCMP(p_enc, "utf8") == 0) if (STRCMP(p_enc, "utf-8") == 0 || STRCMP(p_enc, "utf8") == 0)
utf8_inuse = TRUE; validate_utf8 = TRUE;
if (from_encoding != NULL && STRCMP(from_encoding, "none") == 0)
{
validate_utf8 = FALSE;
vim_free(from_encoding);
from_encoding = NULL;
}
idx = 0; idx = 0;
while (idx < blen) while (idx < blen)
@ -1340,7 +1347,7 @@ f_blob2str(typval_T *argvars, typval_T *rettv)
} }
} }
if (utf8_inuse) if (validate_utf8)
{ {
if (!utf_valid_string(converted_str, NULL)) if (!utf_valid_string(converted_str, NULL))
{ {

3
src/testdir/test_functions.vim
View File

@ -4446,6 +4446,9 @@ func Test_blob2str()
call assert_equal(['a'], blob2str(0z61, test_null_dict())) call assert_equal(['a'], blob2str(0z61, test_null_dict()))
call assert_equal(['a'], blob2str(0z61, {'encoding': test_null_string()})) call assert_equal(['a'], blob2str(0z61, {'encoding': test_null_string()}))
call assert_equal(["\x80"], blob2str(0z80, {'encoding': 'none'}))
call assert_equal(['a', "\x80"], blob2str(0z610A80, {'encoding': 'none'}))
#" Invalid encoding #" Invalid encoding
call assert_fails("call blob2str(0z80)", "E1515: Unable to convert from 'utf-8' encoding") call assert_fails("call blob2str(0z80)", "E1515: Unable to convert from 'utf-8' encoding")
call assert_fails("call blob2str(0z610A80)", "E1515: Unable to convert from 'utf-8' encoding") call assert_fails("call blob2str(0z610A80)", "E1515: Unable to convert from 'utf-8' encoding")

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1144,
/**/ /**/
1143, 1143,
/**/ /**/