patch 9.1.1035: Vim9: memory leak with blob2str()

Problem:  Vim9: memory leak with blob2str()
Solution: free converted_str (Yegappan Lakshmanan)

closes: #16481

Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/strings.c b/src/strings.c
index 53e0171aacce1a361edcea87ff98eef02ab959ac..120d393552efea08beb89e6732849a752f4b4f9e 100644 (file)
--- a/src/strings.c
+++ b/src/strings.c
@@ -1366,9 +1366,10 @@ f_blob2str(typval_T *argvars, typval_T *rettv)
            }
        }
 
-       if (list_append_string(rettv->vval.v_list, converted_str, -1) == FAIL)
-           break;
+       int ret = list_append_string(rettv->vval.v_list, converted_str, -1);
        vim_free(converted_str);
+       if (ret == FAIL)
+           break;
     }
 
 done:

diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index bf3e889165f5a355cfd849e2d7d548aa27f7125b..e31e2ed733f299ea84ce4339a625f4fb17bd8bf3 100644 (file)
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -4311,6 +4311,10 @@ func Test_blob2str()
     call assert_equal(["🁰🁳"], blob2str(0zF09F81B0.F09F81B3))
     call assert_equal(['«»'], blob2str(0zABBB, {'encoding': 'latin1'}))
     call assert_equal(['«»'], blob2str(0zC2ABC2BB, {'encoding': 'utf8'}))
+    call assert_equal(['«»'], blob2str(0zC2ABC2BB, {'encoding': 'utf-8'}))
+
+    call assert_equal(['a'], blob2str(0z61, test_null_dict()))
+    call assert_equal(['a'], blob2str(0z61, {'encoding': test_null_string()}))
 
     #" Invalid encoding
     call assert_fails("call blob2str(0z80)", "E1515: Unable to convert from 'utf-8' encoding")

diff --git a/src/version.c b/src/version.c
index ba41159774aa5867d76f38dcf9db056a26d201d3..260f9b53d6338e50c0cc690c2668daad45c7afee 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1035,
 /**/
     1034,
 /**/