From 1b862c466ba4242857eec581f67982d265005ef4 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 23 Jul 2021 19:30:19 +0200 Subject: [PATCH] patch 8.2.3205: Coverity reports a null pointer dereference Problem: Coverity reports a null pointer dereference. Solution: Change the logic to avoid Coverity gets confused. --- src/version.c | 2 ++ src/vim9compile.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/version.c b/src/version.c index bd3643745..95c99718b 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 3205, /**/ 3204, /**/ diff --git a/src/vim9compile.c b/src/vim9compile.c index 23994342c..fada1346b 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -5175,14 +5175,14 @@ compile_and_or( cctx->ctx_lnum = start_ctx_lnum; status = check_ppconst_bool(ppconst); - if (status == OK) + if (status != FAIL) { // TODO: use ppconst if the value is a constant generate_ppconst(cctx, ppconst); // Every part must evaluate to a bool. - status = (bool_on_stack(cctx)); - if (status == OK) + status = bool_on_stack(cctx); + if (status != FAIL) status = ga_grow(&end_ga, 1); } cctx->ctx_lnum = save_lnum; -- 2.40.0