diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-04-18 15:45:23 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-04-18 15:45:23 +0100 |
| commit | 42ccb8d74700506936567b0eb6d11def5e25e1dd (patch) | |
| tree | e3f0eeda77a045ee35a3306cfb99e9abbe59c416 /src/evalvars.c | |
| parent | 75ab590f8504a8912ca0b8c58f6b897bb7a34f07 (diff) | |
patch 8.2.4783: Coverity warns for leaking memoryv8.2.4783
Problem: Coverity warns for leaking memory.
Solution: Use another strategy freeing "theline".
Diffstat (limited to 'src/evalvars.c')
| -rw-r--r-- | src/evalvars.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/evalvars.c b/src/evalvars.c index 5f04406265..c83aa61c9f 100644 --- a/src/evalvars.c +++ b/src/evalvars.c @@ -684,7 +684,7 @@ eval_all_expr_in_str(char_u *str) list_T * heredoc_get(exarg_T *eap, char_u *cmd, int script_get) { - char_u *theline; + char_u *theline = NULL; char_u *marker; list_T *l; char_u *p; @@ -776,6 +776,7 @@ heredoc_get(exarg_T *eap, char_u *cmd, int script_get) int mi = 0; int ti = 0; + vim_free(theline); theline = eap->getline(NUL, eap->cookie, 0, FALSE); if (theline == NULL) { @@ -789,18 +790,12 @@ heredoc_get(exarg_T *eap, char_u *cmd, int script_get) && STRNCMP(theline, *eap->cmdlinep, marker_indent_len) == 0) mi = marker_indent_len; if (STRCMP(marker, theline + mi) == 0) - { - vim_free(theline); break; - } // If expression evaluation failed in the heredoc, then skip till the // end marker. if (eval_failed) - { - vim_free(theline); continue; - } if (text_indent_len == -1 && *theline != NUL) { @@ -827,7 +822,6 @@ heredoc_get(exarg_T *eap, char_u *cmd, int script_get) if (str == NULL) { // expression evaluation failed - vim_free(theline); eval_failed = TRUE; continue; } @@ -837,8 +831,8 @@ heredoc_get(exarg_T *eap, char_u *cmd, int script_get) if (list_append_string(l, str, -1) == FAIL) break; - vim_free(theline); } + vim_free(theline); vim_free(text_indent); if (eval_failed) |