From: Ulrich Weigand <ulrich.weigand@de.ibm.com>
Date: Fri, 21 May 2021 12:21:15 +0000 (+0200)
Subject: Big-endian fix: JsonWriterHelper (#52790)
X-Git-Tag: submit/tizen/20210909.063632~1246
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=202c9fd3463ada7094762eb1274d948c5dd78bc7;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Big-endian fix: JsonWriterHelper (#52790)

JsonWriterHelper.Transcoding.cs has endian-dependent code that is
guarded via a #if BIGENDIAN.  However, nobody ever defines this
predefine (outside of System.Private.CoreLib) so this doesn't work.

Fixed by using BitConverter.IsLittleEndian like everywhere else.
---

diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Writer/JsonWriterHelper.Transcoding.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Writer/JsonWriterHelper.Transcoding.cs
index 13764565014..1dbe6c3be18 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Writer/JsonWriterHelper.Transcoding.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Writer/JsonWriterHelper.Transcoding.cs
@@ -103,31 +103,37 @@ namespace System.Text.Json
                             }
 
                             // Unfortunately, this is endianess sensitive
-#if BIGENDIAN
-                            *pTarget = (byte)(ch >> 16);
-                            *(pTarget + 1) = (byte)ch;
-                            pSrc += 4;
-                            *(pTarget + 2) = (byte)(chc >> 16);
-                            *(pTarget + 3) = (byte)chc;
-                            pTarget += 4;
-#else // BIGENDIAN
-                            *pTarget = (byte)ch;
-                            *(pTarget + 1) = (byte)(ch >> 16);
-                            pSrc += 4;
-                            *(pTarget + 2) = (byte)chc;
-                            *(pTarget + 3) = (byte)(chc >> 16);
-                            pTarget += 4;
-#endif // BIGENDIAN
+                            if (!BitConverter.IsLittleEndian)
+                            {
+                                *pTarget = (byte)(ch >> 16);
+                                *(pTarget + 1) = (byte)ch;
+                                pSrc += 4;
+                                *(pTarget + 2) = (byte)(chc >> 16);
+                                *(pTarget + 3) = (byte)chc;
+                                pTarget += 4;
+                            }
+                            else
+                            {
+                                *pTarget = (byte)ch;
+                                *(pTarget + 1) = (byte)(ch >> 16);
+                                pSrc += 4;
+                                *(pTarget + 2) = (byte)chc;
+                                *(pTarget + 3) = (byte)(chc >> 16);
+                                pTarget += 4;
+                            }
                         }
                         continue;
 
                     LongCodeWithMask:
-#if BIGENDIAN
-                        // be careful about the sign extension
-                        ch = (int)(((uint)ch) >> 16);
-#else // BIGENDIAN
-                        ch = (char)ch;
-#endif // BIGENDIAN
+                        if (!BitConverter.IsLittleEndian)
+                        {
+                            // be careful about the sign extension
+                            ch = (int)(((uint)ch) >> 16);
+                        }
+                        else
+                        {
+                            ch = (char)ch;
+                        }
                         pSrc++;
 
                         if (ch > 0x7F)