1 files changed, 15 insertions, 24 deletions

diff --git a/src/regexp.c b/src/regexp.c
index fe496e791c..44e25856ce 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -1222,8 +1222,6 @@ static regprog_T *bt_regcomp(char_u *expr, int re_flags)
 
   /* Allocate space. */
   r = (bt_regprog_T *)lalloc(sizeof(bt_regprog_T) + regsize, TRUE);
-  if (r == NULL)
-    return NULL;
 
   /*
    * Second pass: emit code.
@@ -3592,8 +3590,7 @@ static reg_extmatch_T *make_extmatch(void)
   reg_extmatch_T      *em;
 
   em = (reg_extmatch_T *)alloc_clear((unsigned)sizeof(reg_extmatch_T));
-  if (em != NULL)
-    em->refcnt = 1;
+  em->refcnt = 1;
   return em;
 }
 
@@ -5699,8 +5696,6 @@ static int match_with_backref(linenr_T start_lnum, colnr_T start_col, linenr_T e
         len += 50;              /* get some extra */
         vim_free(reg_tofree);
         reg_tofree = alloc(len);
-        if (reg_tofree == NULL)
-          return RA_FAIL;           /* out of memory!*/
         reg_tofreelen = len;
       }
       STRCPY(reg_tofree, regline);
@@ -6451,22 +6446,20 @@ char_u *regtilde(char_u *source, int magic)
         /* length = len(newsub) - 1 + len(prev_sub) + 1 */
         prevlen = (int)STRLEN(reg_prev_sub);
         tmpsub = alloc((unsigned)(STRLEN(newsub) + prevlen));
-        if (tmpsub != NULL) {
-          /* copy prefix */
-          len = (int)(p - newsub);              /* not including ~ */
-          memmove(tmpsub, newsub, (size_t)len);
-          /* interpret tilde */
-          memmove(tmpsub + len, reg_prev_sub, (size_t)prevlen);
-          /* copy postfix */
-          if (!magic)
-            ++p;                                /* back off \ */
-          STRCPY(tmpsub + len + prevlen, p + 1);
-
-          if (newsub != source)                 /* already allocated newsub */
-            vim_free(newsub);
-          newsub = tmpsub;
-          p = newsub + len + prevlen;
-        }
+        /* copy prefix */
+        len = (int)(p - newsub);              /* not including ~ */
+        memmove(tmpsub, newsub, (size_t)len);
+        /* interpret tilde */
+        memmove(tmpsub + len, reg_prev_sub, (size_t)prevlen);
+        /* copy postfix */
+        if (!magic)
+          ++p;                                /* back off \ */
+        STRCPY(tmpsub + len + prevlen, p + 1);
+
+        if (newsub != source)                 /* already allocated newsub */
+          vim_free(newsub);
+        newsub = tmpsub;
+        p = newsub + len + prevlen;
       } else if (magic)
         STRMOVE(p, p + 1);              /* remove '~' */
       else
@@ -6926,8 +6919,6 @@ char_u *reg_submatch(int no)
 
       if (retval == NULL) {
         retval = lalloc((long_u)len, TRUE);
-        if (retval == NULL)
-          return NULL;
       }
     }
   } else {