summaryrefslogtreecommitdiff
path: root/src/mbyte.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-04-11 14:29:17 +0200
committerBram Moolenaar <Bram@vim.org>2011-04-11 14:29:17 +0200
commit0d35e91abfa9e17f7c554bfd33b119b879448c72 (patch)
tree232c44a9da09b376ee61b27cef27777d39ea2b39 /src/mbyte.c
parent4aa97427bede92d74b07ab875de91cb068724c8d (diff)
downloadvim-git-0d35e91abfa9e17f7c554bfd33b119b879448c72.tar.gz
updated for version 7.3.159v7.3.159
Problem: Using uninitialized pointer when out of memory. Solution: Check for NULL return value.
Diffstat (limited to 'src/mbyte.c')
-rw-r--r--src/mbyte.c2
1 files changed, 1 insertions, 1 deletions
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;
}