From 057469c2259a9838268be15509bc680b7e5cd338 Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 10 Oct 2023 10:25:52 +0200 Subject: [PATCH] Import: fixes #10983: Crash when trying to import a DXF file with Polish letters in the name --- src/Mod/Import/App/dxf/dxf.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Mod/Import/App/dxf/dxf.cpp b/src/Mod/Import/App/dxf/dxf.cpp index ce5c44f18b..f43d58f2de 100644 --- a/src/Mod/Import/App/dxf/dxf.cpp +++ b/src/Mod/Import/App/dxf/dxf.cpp @@ -1809,7 +1809,11 @@ CDxfRead::CDxfRead(const char* filepath) memset(m_block_name, '\0', sizeof(m_block_name)); m_ignore_errors = true; - m_ifs = new ifstream(filepath); + m_version = RUnknown; + m_CodePage = nullptr; + m_encoding = nullptr; + + m_ifs = new Base::ifstream(Base::FileInfo(filepath)); if (!(*m_ifs)) { m_fail = true; printf("DXF file didn't load\n"); @@ -1817,9 +1821,6 @@ CDxfRead::CDxfRead(const char* filepath) } m_ifs->imbue(std::locale("C")); - m_version = RUnknown; - m_CodePage = nullptr; - m_encoding = nullptr; stringToUTF8 = &CDxfRead::UTF8ToUTF8; }