1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00

0024932: addsweep does not check if the supplied variable contains a shape

Check for null shape has been added in the command addsweep implementation.

// eliminate warning

Test case for issue CR24932
Test case has been corrected.
This commit is contained in:
msv 2016-11-02 15:43:50 +03:00 committed by apn
parent f0cddd16eb
commit 8878d0ecce
2 changed files with 42 additions and 3 deletions

View File

@ -577,11 +577,12 @@ static Standard_Integer addsweep(Draw_Interpretor& di,
Handle(Law_Interpol) thelaw;
Section = DBRep::Get(a[1], TopAbs_SHAPE);
if (Section.ShapeType() != TopAbs_WIRE &&
Section.ShapeType() != TopAbs_VERTEX)
if (Section.IsNull() ||
(Section.ShapeType() != TopAbs_WIRE &&
Section.ShapeType() != TopAbs_VERTEX))
{
//cout << a[1] <<"is not a wire and is not a vertex!" << endl;
di << a[1] <<"is not a wire and is not a vertex!\n";
di << a[1] <<" is not a wire and is not a vertex!\n";
return 1;
}

View File

@ -0,0 +1,38 @@
puts "========"
puts "OCC24932"
puts "========"
puts ""
#######################################################################################
# addsweep does not check if the supplied variable contains a shape
#######################################################################################
vertex v0 0 0 0
vertex v1 1 0 0
edge e1 v0 v1
wire w1 e1
mksweep w1
shape solid1 So
catch {addsweep solid1} msg
if ![regexp "is not a wire" $msg] {
puts "Error: addsweep did not complaint about wrong argument - solid"
} else {
puts "OK: addsweep noted wrong argument - solid"
}
mksweep w1
shape emptyshape
catch {addsweep emptyshape} msg
if ![regexp "is not a wire" $msg] {
puts "Error: addsweep did not complaint about wrong argument - empty shape"
} else {
puts "OK: addsweep noted wrong argument - empty shape"
}
mksweep w1
if [info exists undefined] {unset undefined}
catch {addsweep undefined} msg
if ![regexp "is not a wire" $msg] {
puts "Error: addsweep did not complaint about wrong argument - undefined variable"
} else {
puts "OK: addsweep noted wrong argument - undefined variable"
}