Mercurial > vim
diff src/eval.c @ 9731:f85d94eee05b v7.4.2141
commit https://github.com/vim/vim/commit/ba96e9af388804364425185b47eed14988302865
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Aug 1 17:10:20 2016 +0200
patch 7.4.2141
Problem: Coverity reports bogus NULL check.
Solution: When checking for a variable in the funccal scope don't pass the
varname.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Mon, 01 Aug 2016 17:15:06 +0200 |
| parents | 80ac9cf77c9b |
| children | 8037eb704e93 |
line wrap: on
line diff
--- a/src/eval.c +++ b/src/eval.c @@ -2838,7 +2838,7 @@ do_unlet(char_u *name, int forceit) } hi = hash_find(ht, varname); if (HASHITEM_EMPTY(hi)) - hi = find_hi_in_scoped_ht(name, &varname, &ht); + hi = find_hi_in_scoped_ht(name, &ht); if (hi != NULL && !HASHITEM_EMPTY(hi)) { di = HI2DI(hi); @@ -7344,8 +7344,7 @@ find_var(char_u *name, hashtab_T **htp, return ret; /* Search in parent scope for lambda */ - return find_var_in_scoped_ht(name, varname ? &varname : NULL, - no_autoload || htp != NULL); + return find_var_in_scoped_ht(name, no_autoload || htp != NULL); } /* @@ -7684,7 +7683,7 @@ set_var( /* Search in parent scope which is possible to reference from lambda */ if (v == NULL) - v = find_var_in_scoped_ht(name, varname ? &varname : NULL, TRUE); + v = find_var_in_scoped_ht(name, TRUE); if ((tv->v_type == VAR_FUNC || tv->v_type == VAR_PARTIAL) && var_check_func_name(name, v == NULL))