1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00

0030550: Coding - Integer overflow in Standard_CString HashCodes

0030551: Foundation Classes - Integer overflow in NCollection_CellFilter HashCode

Signed integers are not used in hash code functions now to prevent undefined behavior on left shift operations with signed integers.
A possibility of negative values of hash codes is eliminated.
INT_MAX → IntegerLast() in hash code functions.
All found hash code functions behaves uniformly now: they return a value in the range [1, theUpperBound]. Relevant comments are added to such functions.
This commit is contained in:
tiv
2019-03-28 12:42:41 +03:00
committed by bugmaster
parent 833034f301
commit 2b2be3fb82
89 changed files with 878 additions and 580 deletions

View File

@@ -33,11 +33,12 @@ public:
DEFINE_STANDARD_ALLOC
//! Returns a HasCode value for the Key <K> in the
//! range 0..Upper.
static Standard_Integer HashCode (const TopoDS_Shape& S, const Standard_Integer Upper);
//! Computes a hash code for the given shape, in the range [1, theUpperBound]
//! @param theShape the shape which hash code is to be computed
//! @param theUpperBound the upper bound of the range a computing hash code must be within
//! @return a computed hash code, in the range [1, theUpperBound]
static Standard_Integer HashCode (const TopoDS_Shape& theShape, const Standard_Integer theUpperBound);
//! Returns True when the two keys are equal. Two same
//! keys must have the same hashcode, the contrary is
//! not necessary.

View File

@@ -17,13 +17,13 @@
#include <TopoDS_Shape.hxx>
//=======================================================================
//function : HashCode
//purpose :
// function : HashCode
// purpose :
//=======================================================================
inline Standard_Integer TopTools_OrientedShapeMapHasher::HashCode
(const TopoDS_Shape& S, const Standard_Integer Upper)
inline Standard_Integer TopTools_OrientedShapeMapHasher::HashCode (const TopoDS_Shape& theShape,
const Standard_Integer theUpperBound)
{
return S.HashCode(Upper);
return theShape.HashCode (theUpperBound);
}
//=======================================================================

View File

@@ -33,11 +33,12 @@ public:
DEFINE_STANDARD_ALLOC
//! Returns a HasCode value for the Key <K> in the
//! range 0..Upper.
static Standard_Integer HashCode (const TopoDS_Shape& S, const Standard_Integer Upper);
//! Computes a hash code for the given shape, in the range [1, theUpperBound]
//! @param theShape the shape which hash code is to be computed
//! @param theUpperBound the upper bound of the range a computing hash code must be within
//! @return a computed hash code, in the range [1, theUpperBound]
static Standard_Integer HashCode (const TopoDS_Shape& theShape, Standard_Integer theUpperBound);
//! Returns True when the two keys are the same. Two
//! same keys must have the same hashcode, the
//! contrary is not necessary.

View File

@@ -17,13 +17,13 @@
#include <TopoDS_Shape.hxx>
//=======================================================================
//function : HashCode
//purpose :
// function : HashCode
// purpose :
//=======================================================================
inline Standard_Integer TopTools_ShapeMapHasher::HashCode
(const TopoDS_Shape& S, const Standard_Integer Upper)
inline Standard_Integer TopTools_ShapeMapHasher::HashCode (const TopoDS_Shape& theShape,
const Standard_Integer theUpperBound)
{
return S.HashCode(Upper);
return theShape.HashCode (theUpperBound);
}
//=======================================================================