From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 11 Apr 2011 12:29:17 +0000 (+0200)
Subject: updated for version 7.3.159
X-Git-Tag: v7.3.159
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0d35e91abfa9e17f7c554bfd33b119b879448c72;p=vim

updated for version 7.3.159
Problem:    Using uninitialized pointer when out of memory.
Solution:   Check for NULL return value.
---

diff --git a/src/mbyte.c b/src/mbyte.c
index 61a7d8bd6..ce0c8975e 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -4129,7 +4129,7 @@ iconv_string(vcp, str, slen, unconvlenp, resultlenp)
 	done = to - (char *)result;
     }
 
-    if (resultlenp != NULL)
+    if (resultlenp != NULL && result != NULL)
 	*resultlenp = (int)(to - (char *)result);
     return result;
 }
diff --git a/src/version.c b/src/version.c
index 77cd01002..3cc982e1f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    159,
 /**/
     158,
 /**/