From d9b8f9be37e66623dc7d09eb67e973ea4aeb19d0 Mon Sep 17 00:00:00 2001
From: Wolfgang Schwotzer <woschwot@gmx.net>
Date: Fri, 28 Jul 2000 23:58:48 +0000
Subject: [PATCH] Added NULL pointer checks.

---
 memory/codepage.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/memory/codepage.c b/memory/codepage.c
index 0b5b96f7300..ae86d50ba32 100644
--- a/memory/codepage.c
+++ b/memory/codepage.c
@@ -246,6 +246,12 @@ INT WINAPI MultiByteToWideChar( UINT page, DWORD flags, LPCSTR src, INT srclen,
     const union cptable *table;
     int ret;
 
+    if (!src || (!dst && dstlen))
+    {
+        SetLastError( ERROR_INVALID_PARAMETER );
+        return 0;
+    }
+
     if (srclen == -1) srclen = strlen(src) + 1;
 
     if (page >= CP_UTF7)
@@ -312,6 +318,12 @@ INT WINAPI WideCharToMultiByte( UINT page, DWORD flags, LPCWSTR src, INT srclen,
     const union cptable *table;
     int ret, used_tmp;
 
+    if (!src || (!dst && dstlen))
+    {
+        SetLastError( ERROR_INVALID_PARAMETER );
+        return 0;
+    }
+
     if (srclen == -1) srclen = strlenW(src) + 1;
 
     if (page >= CP_UTF7)