Ticket #4433: utf8_decode_warn_instead_of_breakpoint_v1.patch

source/lib/utf8.cpp

@@ -1 @@
-/* Copyright (c) 2010 Wildfire Games
+/* Copyright (c) 2016 Wildfire Games
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
  * "Software"), to deal in the Software without restriction, including
  * without limitation the rights to use, copy, modify, merge, publish,
@@ -19 +19 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #include "precompiled.h"
+
 #include "lib/utf8.h"
+#include "ps/CLogger.h"
 
 static const StatusDefinition utf8StatusDefinitions[] = {
     { ERR::UTF8_SURROGATE, L"UTF-16 surrogate pairs aren't supported" },
     { ERR::UTF8_OUTSIDE_BMP, L"Code point outside BMP (> 0x10000)" },
     { ERR::UTF8_NONCHARACTER, L"Noncharacter (e.g. WEOF)" },
@@ -75 +77 @@
 // called from ReplaceIfInvalid and UTF8Codec::Decode
 static UTF32 RaiseError(Status err, Status* perr)
 {
     if(perr)    // caller wants return code, not warning dialog
     {
-        if(*perr == INFO::OK)   // only return the first error (see header)
+        if (*perr == INFO::OK)  // only return the first error (see header)
             *perr = err;
     }
     else
-        DEBUG_WARN_ERR(err);
+    {
+        wchar_t error[200];
+        LOGWARNING("UTF8 error: %s", utf8_from_wstring(StatusDescription(err, error, ARRAY_SIZE(error))));
+    }
 
     return 0xFFFDul;    // replacement character
 }