Mercurial > vim

diff src/mbyte.c @ 2766:415c55534d90 v7.3.159

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.159 Problem: Using uninitialized pointer when out of memory. Solution: Check for NULL return value.
author Bram Moolenaar <bram@vim.org>
date Mon, 11 Apr 2011 14:29:17 +0200
parents fb60c9f35517
children 0bef86c5c985
line wrap: on
line diff
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -4129,7 +4129,7 @@ iconv_string(vcp, str, slen, unconvlenp,
 	done = to - (char *)result;
     }
 
-    if (resultlenp != NULL)
+    if (resultlenp != NULL && result != NULL)
 	*resultlenp = (int)(to - (char *)result);
     return result;
 }