From 64c8ed366de995a01ca1a072a6943ede0d7bb932 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 20 Mar 2019 21:18:34 +0100 Subject: [PATCH] patch 8.1.1025: checking NULL pointer after addition Problem: Checking NULL pointer after addition. (Coverity) Solution: First check for NULL, then add the column. --- src/regexp.c | 5 +++-- src/version.c | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/regexp.c b/src/regexp.c index 4b853172e..5557987d5 100644 --- a/src/regexp.c +++ b/src/regexp.c @@ -7784,9 +7784,10 @@ reg_submatch(int no) if (lnum < 0 || rsm.sm_mmatch->endpos[no].lnum < 0) return NULL; - s = reg_getline_submatch(lnum) + rsm.sm_mmatch->startpos[no].col; - if (s == NULL) /* anti-crash check, cannot happen? */ + s = reg_getline_submatch(lnum); + if (s == NULL) // anti-crash check, cannot happen? break; + s += rsm.sm_mmatch->startpos[no].col; if (rsm.sm_mmatch->endpos[no].lnum == lnum) { /* Within one line: take form start to end col. */ diff --git a/src/version.c b/src/version.c index 2515a2515..e7f3bf3f8 100644 --- a/src/version.c +++ b/src/version.c @@ -779,6 +779,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1025, /**/ 1024, /**/ -- 2.40.0