From d3e008e46cdb48ddf33d8e238d4893679cf2bc92 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Mon, 25 Feb 2019 23:46:31 +0100
Subject: [PATCH] fixes 0003860: Debian bug #920971 - C++ exception on DXF
 import

---
 src/Mod/Import/App/AppImportPy.cpp |  3 +++
 src/Mod/Import/App/ImpExpDxf.cpp   | 33 ++++++++++++++++++++++--------
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/Mod/Import/App/AppImportPy.cpp b/src/Mod/Import/App/AppImportPy.cpp
index 61111e206c..f6df385597 100644
--- a/src/Mod/Import/App/AppImportPy.cpp
+++ b/src/Mod/Import/App/AppImportPy.cpp
@@ -416,6 +416,9 @@ private:
             dxf_file.DoRead(IgnoreErrors);
             pcDoc->recompute();
         }
+        catch (const Standard_Failure& e) {
+            throw Py::RuntimeError(e.GetMessageString());
+        }
         catch (const Base::Exception& e) {
             throw Py::RuntimeError(e.what());
         }
diff --git a/src/Mod/Import/App/ImpExpDxf.cpp b/src/Mod/Import/App/ImpExpDxf.cpp
index 3ea733be3e..794e27edec 100644
--- a/src/Mod/Import/App/ImpExpDxf.cpp
+++ b/src/Mod/Import/App/ImpExpDxf.cpp
@@ -127,9 +127,14 @@ void ImpExpDxfRead::OnReadArc(const double* s, const double* e, const double* c,
         up = -up;
     gp_Pnt pc = makePoint(c);
     gp_Circ circle(gp_Ax2(pc, up), p0.Distance(pc));
-    BRepBuilderAPI_MakeEdge makeEdge(circle, p0, p1);
-    TopoDS_Edge edge = makeEdge.Edge();
-    AddObject(new Part::TopoShape(edge));
+    if (circle.Radius() > 0) {
+        BRepBuilderAPI_MakeEdge makeEdge(circle, p0, p1);
+        TopoDS_Edge edge = makeEdge.Edge();
+        AddObject(new Part::TopoShape(edge));
+    }
+    else {
+        Base::Console().Warning("ImpExpDxf - ignore degenerate arc of circle\n");
+    }
 }
 
 
@@ -141,9 +146,14 @@ void ImpExpDxfRead::OnReadCircle(const double* s, const double* c, bool dir, boo
         up = -up;
     gp_Pnt pc = makePoint(c);
     gp_Circ circle(gp_Ax2(pc, up), p0.Distance(pc));
-    BRepBuilderAPI_MakeEdge makeEdge(circle);
-    TopoDS_Edge edge = makeEdge.Edge();
-    AddObject(new Part::TopoShape(edge));
+    if (circle.Radius() > 0) {
+        BRepBuilderAPI_MakeEdge makeEdge(circle);
+        TopoDS_Edge edge = makeEdge.Edge();
+        AddObject(new Part::TopoShape(edge));
+    }
+    else {
+        Base::Console().Warning("ImpExpDxf - ignore degenerate circle\n");
+    }
 }
 
 
@@ -161,9 +171,14 @@ void ImpExpDxfRead::OnReadEllipse(const double* c, double major_radius, double m
     gp_Pnt pc = makePoint(c);
     gp_Elips ellipse(gp_Ax2(pc, up), major_radius * optionScaling, minor_radius * optionScaling);
     ellipse.Rotate(gp_Ax1(pc,up),rotation);
-    BRepBuilderAPI_MakeEdge makeEdge(ellipse);
-    TopoDS_Edge edge = makeEdge.Edge();
-    AddObject(new Part::TopoShape(edge));
+    if (ellipse.MinorRadius() > 0) {
+        BRepBuilderAPI_MakeEdge makeEdge(ellipse);
+        TopoDS_Edge edge = makeEdge.Edge();
+        AddObject(new Part::TopoShape(edge));
+    }
+    else {
+        Base::Console().Warning("ImpExpDxf - ignore degenerate ellipse\n");
+    }
 }