diff --git a/src/linematch.c b/src/linematch.c
index 17e932d..1fab282 100644
--- a/src/linematch.c
+++ b/src/linematch.c
@@ -410,12 +410,16 @@
 
     // create the flattened path matrix
     diffcmppath_T *diffcmppath = lalloc(sizeof(diffcmppath_T) * memsize, TRUE);
+    if (diffcmppath == NULL)
+	return 0;
+
     // allocate memory here
+    size_t n = (size_t)pow(2.0, (double)ndiffs);
     for (size_t i = 0; i < memsize; i++)
     {
 	diffcmppath[i].df_lev_score = 0;
 	diffcmppath[i].df_path_n = 0;
-	for (size_t j = 0; j < (size_t)pow(2, (double)ndiffs); j++)
+	for (size_t j = 0; j < n; j++)
 	    diffcmppath[i].df_choice_mem[j] = -1;
     }
 
@@ -428,6 +432,12 @@
     diffcmppath_T *startNode = &diffcmppath[u];
 
     *decisions = lalloc(sizeof(int) * memsize_decisions, TRUE);
+    if (*decisions == NULL)
+    {
+	vim_free(diffcmppath);
+	return 0;
+    }
+
     size_t n_optimal = 0;
     test_charmatch_paths(startNode, 0);
     while (startNode->df_path_n > 0)
diff --git a/src/version.c b/src/version.c
index 90ddf0b..e2314ca 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1303,
+/**/
     1302,
 /**/
     1301,