Tera TermRevision: 8303
https://osdn.net/projects/ttssh2/scm/svn/commits/8303
Author: zmatsuo
Date: 2019-10-15 01:13:18 +0900 (Tue, 15 Oct 2019)
Log Message:
-----------
ToCharW(),ToCharA(),ToWcharA()などでNULLポインタを渡せるようにした
- NULLを渡すと、NULLポインタが返る
Modified Paths:
--------------
trunk/teraterm/common/codeconv.cpp
-------------- next part --------------
Modified: trunk/teraterm/common/codeconv.cpp
===================================================================
--- trunk/teraterm/common/codeconv.cpp 2019-10-14 16:13:08 UTC (rev 8302)
+++ trunk/teraterm/common/codeconv.cpp 2019-10-14 16:13:18 UTC (rev 8303)
@@ -930,6 +930,7 @@
char *ToCharW(const wchar_t *strW)
{
+ if (strW == NULL) return NULL;
char *strA = _WideCharToMultiByte(strW, 0, CP_ACP, NULL);
return strA;
}
@@ -936,11 +937,13 @@
char *ToCharA(const char *strA)
{
+ if (strA == NULL) return NULL;
return _strdup(strA);
}
char *ToCharU8(const char *strU8)
{
+ if (strU8 == NULL) return NULL;
wchar_t *strW = _MultiByteToWideChar(strU8, 0, CP_UTF8, NULL);
if (strW == NULL) {
return NULL;
@@ -952,6 +955,7 @@
wchar_t *ToWcharA(const char *strA)
{
+ if (strA == NULL) return NULL;
wchar_t *strW = _MultiByteToWideChar(strA, 0, CP_ACP, NULL);
return strW;
}
@@ -958,11 +962,13 @@
wchar_t *ToWcharW(const wchar_t *strW)
{
+ if (strW == NULL) return NULL;
return _wcsdup(strW);
}
wchar_t *ToWcharU8(const char *strU8)
{
+ if (strU8 == NULL) return NULL;
wchar_t *strW = _MultiByteToWideChar(strU8, 0, CP_UTF8, NULL);
return strW;
}
@@ -969,6 +975,7 @@
char *ToU8W(const wchar_t *strW)
{
+ if (strW == NULL) return NULL;
char *strU8 = _WideCharToMultiByte(strW, 0, CP_UTF8, NULL);
return strU8;
}
@@ -975,6 +982,7 @@
char *ToU8A(const char *strA)
{
+ if (strA == NULL) return NULL;
wchar_t *strW = _MultiByteToWideChar(strA, 0, CP_ACP, NULL);
if (strW == NULL) {
return NULL;