Skip to content

Avoid segfault when importing an incorrect curve #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lelandaisb merged 1 commit into from
Oct 28, 2025
Merged

Avoid segfault when importing an incorrect curve #171

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 28 additions & 19 deletions src/Core/Internal/ImportMDLImplementation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,16 +633,16 @@ Geom::Curve* ImportMDLImplementation::getCurve(const std::string name)
Geom::Vertex* vtx2 = getVertex(current_command.model1d.pt2);
if(vtx1!=vtx2)
{
crv = Geom::EntityFactory(m_context).newSegment(vtx1,vtx2);
crv = Geom::EntityFactory(m_context).newSegment(vtx1,vtx2);

//creation des connections topologiques
crv->add(vtx1);
crv->add(vtx2);
vtx1->add(crv);
vtx2->add(crv);
//creation des connections topologiques
crv->add(vtx1);
crv->add(vtx2);
vtx1->add(crv);
vtx2->add(crv);
}
else {
//std::cerr<<"IMPORT D'UN SEGMENT DE LONGUEUR NULLE NON EFFECTUEE ("<<name<<")"<<std::endl;
//std::cerr<<"IMPORT D'UN SEGMENT DE LONGUEUR NULLE NON EFFECTUE ("<<name<<")"<<std::endl;
TkUtil::UTF8String messErr (TkUtil::Charset::UTF_8);
messErr << "On ne peut créer un segment de taille nulle pour "<<name;
throw TkUtil::Exception(messErr);
Expand All @@ -656,19 +656,28 @@ Geom::Curve* ImportMDLImplementation::getCurve(const std::string name)
Geom::Vertex* vtxcenter = getVertex(current_command.u.arc.center);
bool dir = bool(current_command.u.arc.direction);
//std::cout<<"direction = "<<current_command.u.arc.direction<<" => dir = "<<(dir?"true":"false")<<std::endl;
if(current_command.u.arc.is_circle)
crv = Geom::EntityFactory(m_context).newArcCircle2D(vtxcenter,vtx1,vtx2, dir);
else
crv = Geom::EntityFactory(m_context).newArcEllipse(vtxcenter,vtx1,vtx2, dir);

//creation des connections topologiques
crv->add(vtx1);
vtx1->add(crv);
if(vtx2!=vtx1){
crv->add(vtx2);
vtx2->add(crv);
if(vtx1!=vtx2)
{
if(current_command.u.arc.is_circle)
crv = Geom::EntityFactory(m_context).newArcCircle2D(vtxcenter,vtx1,vtx2, dir);
else
crv = Geom::EntityFactory(m_context).newArcEllipse(vtxcenter,vtx1,vtx2, dir);

//creation des connections topologiques
crv->add(vtx1);
vtx1->add(crv);
if(vtx2!=vtx1){
crv->add(vtx2);
vtx2->add(crv);
}
}
}
else {
//std::cerr<<"IMPORT D'UNE COURBE AVEC DEUX POINTS IDENTIQUES NON EFFECTUE ("<<name<<")"<<std::endl;
TkUtil::UTF8String messErr (TkUtil::Charset::UTF_8);
messErr << "On ne peut créer une courbe avec un point de départ et un point d'arrivée identiques pour "<<name;
throw TkUtil::Exception(messErr);
}
}
else if (current_command.type == MdlLine){
// on va créer des Vertex même pour les points interne au support
// de manière à rendre se dernier modifiable
Expand Down