[MERGE #5505 @kfukuda2] Fix Jshost printing of strings with embedded null characters. Fixes OS#16538950

Merge pull request #5505 from kfukuda2:nullPrintFix

Author: Kenji Fukuda

lib/Runtime/Base/FunctionBody.cpp

@@ -4551,13 +4551,17 @@ namespace Js
             }
             Output::Print(_u("\n\n  Line %3d: "), line + 1);
             // Need to match up cchStartOffset to appropriate cbStartOffset given function's cbStartOffset and cchStartOffset
-            size_t i = utf8::CharacterIndexToByteIndex(source, sourceInfo->GetCbLength(), cchStartOffset, this->m_cbStartOffset, this->m_cchStartOffset);
+            size_t utf8SrcStartIdx = utf8::CharacterIndexToByteIndex(source, sourceInfo->GetCbLength(), cchStartOffset, this->m_cbStartOffset, this->m_cchStartOffset);
 
-            size_t lastOffset = StartOffset() + LengthInBytes();
-            for (;i < lastOffset && source[i] != '\n' && source[i] != '\r'; i++)
+            size_t utf8SrcEndIdx = StartOffset() + LengthInBytes();
+            char16* utf16Buf = HeapNewArray(char16, utf8SrcEndIdx - utf8SrcStartIdx + 2); 
+            size_t utf16BufSz = utf8::DecodeUnitsIntoAndNullTerminateNoAdvance(utf16Buf, source + utf8SrcStartIdx, source + utf8SrcEndIdx, utf8::DecodeOptions::doDefault);
+            Assert(utf16BufSz <= utf8SrcEndIdx - utf8SrcStartIdx);
+            for (size_t i = 0; i < utf16BufSz && utf16Buf[i] != _u('\n') && utf16Buf[i] != _u('\r'); i++)
             {
-                Output::Print(_u("%C"), source[i]);
+                Output::Print(_u("%lc"), utf16Buf[i]);
             }
+            HeapDeleteArray(utf8SrcEndIdx - utf8SrcStartIdx + 2, utf16Buf);
             Output::Print(_u("\n"));
             Output::Print(_u("  Col %4d:%s^\n"), col + 1, ((col+1)<10000) ? _u(" ") : _u(""));
 

test/es5/hasItem.jshost.baseline

@@ -185,16 +185,6 @@
     <default>
       <files>hasItem.js</files>
       <baseline>hasItem.baseline</baseline>
-      <!-- Bug 16538950: jshost - adapt the ch change to support printing strings with U+0000 (NULL) -->
-      <tags>exclude_jshost</tags>
-    </default>
-  </test>
-  <test>
-    <default>
-      <files>hasItem.js</files>
-      <baseline>hasItem.jshost.baseline</baseline>
-      <!-- Bug 16538950: jshost - adapt the ch change to support printing strings with U+0000 (NULL) -->
-      <tags>exclude_ch</tags>
     </default>
   </test>
   <test>

test/es5/rlexe.xml

@@ -45,14 +45,12 @@
     <default>
       <files>utf8_console_log.js</files>
       <baseline>utf8_console_log.baseline</baseline>
-      <tags>exclude_jshost</tags>
     </default>
   </test>
   <test>
     <default>
       <files>utf8_console_log_null_embedded.js</files>
       <baseline>utf8_console_log_null_embedded.baseline</baseline>
-      <tags>exclude_jshost</tags>
     </default>
   </test>
 </regress-exe>