OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

0022749: Segfault in HashCode() of Standard_Transient

Browse Source
This commit is contained in:
DBV 2012-02-17 11:40:25 +00:00 committed by bugmaster
parent 982a90fcba
commit ec6a1aa771
8 changed files with 14 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Graphic2d/Graphic2d_Buffer.cxx
View File

@ -311,7 +311,7 @@ printf(" Graphic2d_Buffer::ReLoad(%d)\n",ResetPosition);
#endif #endif
if( !myDriver.IsNull() ) { if( !myDriver.IsNull() ) {
myBufferId = this->HashCode(IntegerLast()); myBufferId = ::HashCode ((Standard_Address)this, IntegerLast());
// Maximum depth of primitive lines // Maximum depth of primitive lines
// contained in the buffer is required // contained in the buffer is required

8
src/Standard/Standard_Persistent.cxx
View File

@ -96,14 +96,6 @@ Standard_Boolean Standard_Persistent::IsKind (const Handle(Standard_Type)& aType
// return (aType == STANDARD_TYPE(Standard_Persistent)); // return (aType == STANDARD_TYPE(Standard_Persistent));
} }
//============================================================================
Standard_Integer Standard_Persistent::HashCode(const Standard_Integer Lim)const
{
Handle(Standard_Persistent) me = this;
return ::HashCode(me, Lim);
}
void Standard_Persistent::ShallowDump(Standard_OStream& AStream) const void Standard_Persistent::ShallowDump(Standard_OStream& AStream) const
{ {
Handle(Standard_Persistent) me = this; Handle(Standard_Persistent) me = this;

1
src/Standard/Standard_Persistent_proto.hxx
View File

@ -58,7 +58,6 @@ public:
Standard_EXPORT virtual const Handle_Standard_Type& DynamicType() const; Standard_EXPORT virtual const Handle_Standard_Type& DynamicType() const;
Standard_EXPORT Standard_Boolean IsKind(const Handle_Standard_Type&)const; Standard_EXPORT Standard_Boolean IsKind(const Handle_Standard_Type&)const;
Standard_EXPORT Standard_Boolean IsInstance(const Handle_Standard_Type&)const; Standard_EXPORT Standard_Boolean IsInstance(const Handle_Standard_Type&)const;
Standard_EXPORT virtual Standard_Integer HashCode(const Standard_Integer Upper) const;
Standard_EXPORT virtual void ShallowDump(Standard_OStream& ) const; Standard_EXPORT virtual void ShallowDump(Standard_OStream& ) const;
}; };

7
src/Standard/Standard_Transient.cxx
View File

@ -55,13 +55,6 @@ Standard_Boolean Standard_Transient::IsKind (const Standard_CString theTypeName)
return DynamicType()->SubType ( theTypeName ); return DynamicType()->SubType ( theTypeName );
} }
//============================================================================
Standard_Integer Standard_Transient::HashCode(const Standard_Integer Lim) const
{
return ::HashCode(this, Lim);
}
void Standard_Transient::ShallowDump(Standard_OStream& theStream) const void Standard_Transient::ShallowDump(Standard_OStream& theStream) const
{ {
theStream << "class " << DynamicType()->Name() << " at " << this << endl; theStream << "class " << DynamicType()->Name() << " at " << this << endl;

4
src/Standard/Standard_Transient_proto.hxx
View File

@ -52,10 +52,6 @@ class Standard_Transient
//! Memory deallocator for transient classes //! Memory deallocator for transient classes
Standard_EXPORT virtual void Delete() const; Standard_EXPORT virtual void Delete() const;
//! Returns a hash code value for this object.
//! The value is in the range 1..Upper.
Standard_EXPORT virtual Standard_Integer HashCode(const Standard_Integer Upper) const;
Standard_EXPORT virtual void ShallowDump(Standard_OStream& ) const; Standard_EXPORT virtual void ShallowDump(Standard_OStream& ) const;
//! Returns a type information object about this object. //! Returns a type information object about this object.

2
src/TopLoc/TopLoc_Location.cxx
View File

@ -200,7 +200,7 @@ Standard_Integer TopLoc_Location::HashCode(const Standard_Integer upper) const
TopLoc_SListOfItemLocation items = myItems; TopLoc_SListOfItemLocation items = myItems;
while (items.More()) { while (items.More()) {
depth += 3; depth += 3;
unsigned int i = items.Value().myDatum->HashCode(upper); unsigned int i = ::HashCode (items.Value().myDatum, upper);
unsigned int j = ( (i + items.Value().myPower) <<depth); unsigned int j = ( (i + items.Value().myPower) <<depth);
j = j>>(32-depth) | j<<depth; j = j>>(32-depth) | j<<depth;
h ^= j; h ^= j;

22
src/WNT/WNT_WDriver.cxx
View File

@ -387,14 +387,10 @@ void WNT_WDriver :: SetMarkerAttrib (
Standard_Boolean WNT_WDriver :: IsKnownImage ( Standard_Boolean WNT_WDriver :: IsKnownImage (
const Handle( Standard_Transient )& anImage const Handle( Standard_Transient )& anImage
) { )
{
return myWNTWindow -> myImages -> Index ( return myWNTWindow -> myImages -> Index ( ::HashCode (anImage, IntegerLast())
anImage -> HashCode(
IntegerLast ()
)
) ? Standard_True : Standard_False; ) ? Standard_True : Standard_False;
} // end WNT_WDriver :: IsKnownImage } // end WNT_WDriver :: IsKnownImage
Standard_Boolean WNT_WDriver :: SizeOfImageFile ( Standard_Boolean WNT_WDriver :: SizeOfImageFile (
@ -417,9 +413,7 @@ Standard_Boolean WNT_WDriver :: SizeOfImageFile (
void WNT_WDriver :: ClearImage ( const Handle( Standard_Transient )& anImageId ) { void WNT_WDriver :: ClearImage ( const Handle( Standard_Transient )& anImageId ) {
Standard_Integer i = myWNTWindow -> myImages -> Index ( Standard_Integer i = myWNTWindow -> myImages -> Index (
anImageId -> HashCode ( ::HashCode (anImageId, IntegerLast())
IntegerLast ()
)
); );
if ( i ) myWNTWindow -> myImages -> Discard ( i ); if ( i ) myWNTWindow -> myImages -> Discard ( i );
@ -441,9 +435,7 @@ void WNT_WDriver :: DrawImage (
) { ) {
Standard_Integer i = myWNTWindow -> myImages -> Index ( Standard_Integer i = myWNTWindow -> myImages -> Index (
anImageId -> HashCode ( ::HashCode (anImageId, IntegerLast())
IntegerLast ()
)
); );
if ( i ) A -> Image ( if ( i ) A -> Image (
@ -512,7 +504,7 @@ void WNT_WDriver :: FillAndDrawImage (
hpo = SelectPalette ( hdcMem, ( HPALETTE )gDev -> HPalette (), FALSE ); hpo = SelectPalette ( hdcMem, ( HPALETTE )gDev -> HPalette (), FALSE );
i = myWNTWindow -> myImages -> Index ( i = myWNTWindow -> myImages -> Index (
h = anImageId -> HashCode ( IntegerLast () ) h = ::HashCode (anImageId, IntegerLast())
); );
if ( i == 0 ) i = myWNTWindow -> myImages -> Open ( hdc, Width, Height, h ); if ( i == 0 ) i = myWNTWindow -> myImages -> Open ( hdc, Width, Height, h );
@ -586,7 +578,7 @@ void WNT_WDriver :: FillAndDrawImage (
hpo = SelectPalette ( hdcMem, ( HPALETTE )gDev -> HPalette (), FALSE ); hpo = SelectPalette ( hdcMem, ( HPALETTE )gDev -> HPalette (), FALSE );
i = myWNTWindow -> myImages -> Index ( i = myWNTWindow -> myImages -> Index (
h = anImageId -> HashCode ( IntegerLast () ) h = ::HashCode (anImageId, IntegerLast())
); );
if ( i == 0 ) i = myWNTWindow -> myImages -> Open ( hdc, Width, Height, h ); if ( i == 0 ) i = myWNTWindow -> myImages -> Open ( hdc, Width, Height, h );

10
src/Xw/Xw_Driver.cxx
View File

@ -865,7 +865,7 @@ Standard_Boolean setattrib = Standard_False;
Standard_Boolean Xw_Driver::IsKnownImage(const Handle(Standard_Transient)& anImage) { Standard_Boolean Xw_Driver::IsKnownImage(const Handle(Standard_Transient)& anImage) {
MyImage = Xw_get_image_handle( MyExtendedDrawable, MyImage = Xw_get_image_handle( MyExtendedDrawable,
(void*)(anImage->HashCode(IntegerLast())) ) ; (void*)(::HashCode (anImage, IntegerLast())) ) ;
if( MyImage ) return (Standard_True) ; if( MyImage ) return (Standard_True) ;
else return Standard_False; else return Standard_False;
@ -899,7 +899,7 @@ float zoom;
void Xw_Driver::ClearImage (const Handle(Standard_Transient)& anImage) { void Xw_Driver::ClearImage (const Handle(Standard_Transient)& anImage) {
MyImage = Xw_get_image_handle( MyExtendedDrawable, MyImage = Xw_get_image_handle( MyExtendedDrawable,
(void*) (anImage->HashCode(IntegerLast())) ) ; (void*) (::HashCode (anImage, IntegerLast())) ) ;
if( MyImage ) { if( MyImage ) {
status = Xw_close_image (MyImage); status = Xw_close_image (MyImage);
@ -921,7 +921,7 @@ XW_EXT_IMAGEDATA *pimage;
void Xw_Driver::DrawImage (const Handle(Standard_Transient)& anImage, const Standard_ShortReal aX, const Standard_ShortReal aY) { void Xw_Driver::DrawImage (const Handle(Standard_Transient)& anImage, const Standard_ShortReal aX, const Standard_ShortReal aY) {
MyImage = Xw_get_image_handle( MyExtendedDrawable, MyImage = Xw_get_image_handle( MyExtendedDrawable,
(void*) (anImage->HashCode(IntegerLast())) ) ; (void*) (::HashCode (anImage, IntegerLast())) ) ;
if( MyImage ) { if( MyImage ) {
status = Xw_draw_image (MyExtendedDrawable, MyImage, aX, aY); status = Xw_draw_image (MyExtendedDrawable, MyImage, aX, aY);
@ -973,7 +973,7 @@ GRAPHIC2D_PIXEL pixel;
if ((aWidth > 0) && (aHeight > 0)) { if ((aWidth > 0) && (aHeight > 0)) {
if( !MyImage ) { if( !MyImage ) {
MyImage = Xw_open_image (MyExtendedDrawable, MyImage = Xw_open_image (MyExtendedDrawable,
(void*) (anImage->HashCode(IntegerLast())), (void*) (::HashCode (anImage, IntegerLast())),
int (aWidth),int (aHeight)); int (aWidth),int (aHeight));
} }
if( !MyImage ) { if( !MyImage ) {
@ -1092,7 +1092,7 @@ GRAPHIC2D_PIXEL pixel;
if ((aWidth > 0) && (aHeight > 0) && (anIndexOfLine == 0)) { if ((aWidth > 0) && (aHeight > 0) && (anIndexOfLine == 0)) {
if( !MyImage ) { if( !MyImage ) {
MyImage = Xw_open_image (MyExtendedDrawable, MyImage = Xw_open_image (MyExtendedDrawable,
(void*) (anImage->HashCode(IntegerLast())), (void*) (::HashCode (anImage, IntegerLast())),
int (aWidth),int (aHeight)); int (aWidth),int (aHeight));
} }
} }