From 1e830a8800156097ccb3ef6124dced30d4002e76 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sat, 29 Apr 2023 20:00:07 +0200 Subject: [PATCH] Import: fixes #9438: Crash when loading DXF file with a text element --- src/Mod/Import/App/dxf/dxf.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Mod/Import/App/dxf/dxf.cpp b/src/Mod/Import/App/dxf/dxf.cpp index 9dd9206fe8..5e6189b07a 100644 --- a/src/Mod/Import/App/dxf/dxf.cpp +++ b/src/Mod/Import/App/dxf/dxf.cpp @@ -1769,6 +1769,7 @@ CDxfRead::CDxfRead(const char* filepath) m_version = RUnknown; m_CodePage = NULL; m_encoding = NULL; + stringToUTF8 = &CDxfRead::UTF8ToUTF8; } CDxfRead::~CDxfRead() @@ -3366,10 +3367,12 @@ bool CDxfRead::ResolveEncoding() } return m_encoding != NULL; } + const char* CDxfRead::UTF8ToUTF8(const char* encoded) const { return encoded; } + const char* CDxfRead::GeneralToUTF8(const char* encoded) const { Base::PyGILStateLocker lock; @@ -3390,6 +3393,7 @@ const char* CDxfRead::GeneralToUTF8(const char* encoded) const Py_DECREF(decoded); return result; } + void CDxfRead::DoRead(const bool ignore_errors /* = false */) { m_ignore_errors = ignore_errors;