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.
diff --git a/src/eval.c b/src/eval.c
index 495bbb0..1adbabc 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2838,7 +2838,7 @@
}
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 @@
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 @@
/* 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))