Fixed issue dotnet/coreclr#11383 (dotnet/coreclr#11385)

Commit migrated from https://github.com/dotnet/coreclr/commit/f0a850b785d73740add815329409183de23a2c35

diff --git a/src/coreclr/src/scripts/genXplatLttng.py b/src/coreclr/src/scripts/genXplatLttng.py
index bacf034..6dd60b0 100644 (file)
--- a/src/coreclr/src/scripts/genXplatLttng.py
+++ b/src/coreclr/src/scripts/genXplatLttng.py
@@ -593,6 +593,7 @@ bool ResizeBuffer(char *&buffer, int& size, int currLen, int newSize, bool &fixe
 
 bool WriteToBuffer(const BYTE *src, int len, char *&buffer, int& offset, int& size, bool &fixedBuffer)
 {
+    if (!src) return true;
        if (offset + len)
        {
                if (!ResizeBuffer(buffer, size, offset, size + len, fixedBuffer))
@@ -606,6 +607,7 @@ bool WriteToBuffer(const BYTE *src, int len, char *&buffer, int& offset, int& si
 
 bool WriteToBuffer(PCWSTR str, char *&buffer, int& offset, int& size, bool &fixedBuffer)
 {
+    if (!str) return true;
        int byteCount = (PAL_wcslen(str) + 1) * sizeof(*str);
 
        if (offset + byteCount)
@@ -621,6 +623,7 @@ bool WriteToBuffer(PCWSTR str, char *&buffer, int& offset, int& size, bool &fixe
 
 bool WriteToBuffer(const char *str, char *&buffer, int& offset, int& size, bool &fixedBuffer)
 {
+    if (!str) return true;
        int len = strlen(str) + 1;
        if (offset + len)
        {
@@ -762,4 +765,4 @@ def main(argv):
 
 if __name__ == '__main__':
     return_code = main(sys.argv[1:])
-    sys.exit(return_code)
\ No newline at end of file
+    sys.exit(return_code)

diff --git a/src/coreclr/src/vm/eventtrace.cpp b/src/coreclr/src/vm/eventtrace.cpp
index b3ee17e..70ea18f 100644 (file)
--- a/src/coreclr/src/vm/eventtrace.cpp
+++ b/src/coreclr/src/vm/eventtrace.cpp
@@ -6760,9 +6760,9 @@ VOID ETW::MethodLog::SendHelperEvent(ULONGLONG ullHelperStartAddress, ULONG ulHe
                                      ulHelperSize, 
                                      0, 
                                      methodFlags, 
-                                     NULL, 
+                                     NULL,
                                      pHelperName, 
-                                     NULL, 
+                                     NULL,
                                      GetClrInstanceId());
     }
 }