diff options
| author | Sergey Andreenko <seandree@microsoft.com> | 2017-10-16 23:40:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-16 23:40:43 -0700 |
| commit | fe88586cf7da09f4e6a90461239262d8c7d8eb61 (patch) | |
| tree | 93e851b3b843605a14b393655b348c8b6f18a8cf /src/ToolBox | |
| parent | 1d43cec000dd6ece495ace8c4b22216871ae5346 (diff) | |
| download | coreclr-fe88586cf7da09f4e6a90461239262d8c7d8eb61.tar.gz coreclr-fe88586cf7da09f4e6a90461239262d8c7d8eb61.tar.bz2 coreclr-fe88586cf7da09f4e6a90461239262d8c7d8eb61.zip | |
protect strlen from nullptr (#14533)
Diffstat (limited to 'src/ToolBox')
| -rw-r--r-- | src/ToolBox/superpmi/superpmi-shared/methodcontext.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/ToolBox/superpmi/superpmi-shared/methodcontext.cpp b/src/ToolBox/superpmi/superpmi-shared/methodcontext.cpp index c3ae9d3a52..4828a47387 100644 --- a/src/ToolBox/superpmi/superpmi-shared/methodcontext.cpp +++ b/src/ToolBox/superpmi/superpmi-shared/methodcontext.cpp @@ -985,7 +985,7 @@ void MethodContext::recGetMethodName(CORINFO_METHOD_HANDLE ftn, char* methodname else value.A = (DWORD)-1; - if (moduleName != nullptr) + if ((moduleName != nullptr) && (*moduleName != nullptr)) value.B = GetMethodName->AddBuffer((unsigned char*)*moduleName, (DWORD)strlen(*moduleName) + 1); else value.B = (DWORD)-1; @@ -1046,13 +1046,14 @@ void MethodContext::recGetMethodNameFromMetadata(CORINFO_METHOD_HANDLE ftn, else value.A = (DWORD)-1; - if (className != nullptr) + if ((className != nullptr) && (*className != nullptr)) value.B = GetMethodNameFromMetadata->AddBuffer((unsigned char*)*className, (DWORD)strlen(*className) + 1); else value.B = (DWORD)-1; - if (namespaceName != nullptr) - value.C = GetMethodNameFromMetadata->AddBuffer((unsigned char*)*namespaceName, (DWORD)strlen(*namespaceName) + 1); + if ((namespaceName != nullptr) && (*namespaceName != nullptr)) + value.C = + GetMethodNameFromMetadata->AddBuffer((unsigned char*)*namespaceName, (DWORD)strlen(*namespaceName) + 1); else value.C = (DWORD)-1; @@ -4197,7 +4198,7 @@ void MethodContext::recGetFieldName(CORINFO_FIELD_HANDLE ftn, const char** modul else value.A = (DWORD)-1; - if (moduleName != nullptr) // protect strlen + if ((moduleName != nullptr) && (*moduleName != nullptr)) // protect strlen value.B = (DWORD)GetFieldName->AddBuffer((unsigned char*)*moduleName, (DWORD)strlen(*moduleName) + 1); else value.B = (DWORD)-1; |