Merge pull request #23503 from maxwxyz/issue-22123

Fix STEP import with bad string behavior

src/Base/Persistence.cpp

@@ -24,7 +24,11 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+#include <algorithm>
+#include <array>
 #include <cassert>
+#include <codecvt>
+#include <locale>
 #endif
 
 #include <zipios++/zipinputstream.h>
@@ -112,6 +116,41 @@ std::string Persistence::encodeAttribute(const std::string& str)
     return tmp;
 }
 
+// clang-format off
+// https://www.w3.org/TR/xml/#charsets
+static constexpr std::array<std::pair<char32_t, char32_t>, 6> validRanges {{
+    {0x9, 0x9},
+    {0xA, 0xA},
+    {0xD, 0xD},
+    {0x20, 0xD7FF},
+    {0xE000, 0xFFFD},
+    {0x10000, 0x10FFFF},
+}};
+// clang-format on
+
+/*!
+ * In XML not all valid Unicode characters are allowed. Replace all
+ * disallowed characters with '_'
+ */
+std::string Persistence::validateXMLString(const std::string& str)
+{
+    std::wstring_convert<std::codecvt_utf8<char32_t>, char32_t> cvt;
+    std::u32string cp_in = cvt.from_bytes(str);
+    std::u32string cp_out;
+    cp_out.reserve(cp_in.size());
+    for (auto cp : cp_in) {
+        if (std::any_of(validRanges.begin(), validRanges.end(), [cp](const auto& range) {
+                return cp >= range.first && cp <= range.second;
+            })) {
+            cp_out += cp;
+        }
+        else {
+            cp_out += '_';
+        }
+    }
+    return cvt.to_bytes(cp_out);
+}
+
 void Persistence::dumpToStream(std::ostream& stream, int compression)
 {
     // we need to close the zipstream to get a good result, the only way to do this is to delete the

src/Base/Persistence.h

@@ -147,6 +147,8 @@ public:
     virtual void RestoreDocFile(Reader& /*reader*/);
     /// Encodes an attribute upon saving.
     static std::string encodeAttribute(const std::string&);
+    /// Replaces all characters with '_' that are not allowed in XML
+    static std::string validateXMLString(const std::string& str);
 
     // dump the binary persistence data into into the stream
     void dumpToStream(std::ostream& stream, int compression);

src/Base/PreCompiled.h

@@ -32,6 +32,8 @@
 #include <Python.h>
 
 // standard
+#include <algorithm>
+#include <array>
 #include <fcntl.h>
 #include <cstdio>
 #include <cassert>
@@ -39,6 +41,7 @@
 #include <chrono>
 #include <cmath>
 #include <codecvt>
+#include <locale>
 
 #ifdef FC_OS_WIN32
 #include <direct.h>