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

0030978: Visualization - stack-use-after-scope reported by Clang address sanitizer in OpenGl_Text.cxx

Browse Source 
Implementation of auxiliary class in OpenGl_Text.cxx is corrected to avoid storing reference to temporary object.

Off-topic: test parse rules are corrected to recognize situation when test is killed by elapsed time, and report it as such.
This commit is contained in:
abv 2019-09-18 03:48:35 +03:00 committed by bugmaster
parent 05ed7ed8e0
commit 1f44d29a0f
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/OpenGl/OpenGl_Text.cxx
View File

@ -38,12 +38,12 @@ namespace
//! Auxiliary tool for setting polygon offset temporarily. //! Auxiliary tool for setting polygon offset temporarily.
struct BackPolygonOffsetSentry struct BackPolygonOffsetSentry
{ {
BackPolygonOffsetSentry (const Handle(OpenGl_Context)& theCtx) BackPolygonOffsetSentry (OpenGl_Context* theCtx)
: myCtx (theCtx), : myCtx (theCtx)
myOffsetBack (!theCtx.IsNull() ? theCtx->PolygonOffset() : Graphic3d_PolygonOffset())
{ {
if (!theCtx.IsNull()) if (theCtx != NULL)
{ {
myOffsetBack = theCtx->PolygonOffset();
Graphic3d_PolygonOffset aPolyOffset = myOffsetBack; Graphic3d_PolygonOffset aPolyOffset = myOffsetBack;
aPolyOffset.Mode = Aspect_POM_Fill; aPolyOffset.Mode = Aspect_POM_Fill;
aPolyOffset.Units += 1.0f; aPolyOffset.Units += 1.0f;
@ -53,7 +53,7 @@ namespace
~BackPolygonOffsetSentry() ~BackPolygonOffsetSentry()
{ {
if (!myCtx.IsNull()) if (myCtx != NULL)
{ {
myCtx->SetPolygonOffset (myOffsetBack); myCtx->SetPolygonOffset (myOffsetBack);
} }
@ -63,8 +63,8 @@ namespace
BackPolygonOffsetSentry (const BackPolygonOffsetSentry& ); BackPolygonOffsetSentry (const BackPolygonOffsetSentry& );
BackPolygonOffsetSentry& operator= (const BackPolygonOffsetSentry& ); BackPolygonOffsetSentry& operator= (const BackPolygonOffsetSentry& );
private: private:
const Handle(OpenGl_Context)& myCtx; OpenGl_Context* myCtx;
const Graphic3d_PolygonOffset myOffsetBack; Graphic3d_PolygonOffset myOffsetBack;
}; };
} // anonymous namespace } // anonymous namespace
@ -744,13 +744,13 @@ void OpenGl_Text::render (const Handle(OpenGl_Context)& theCtx,
} }
case Aspect_TODT_SUBTITLE: case Aspect_TODT_SUBTITLE:
{ {
BackPolygonOffsetSentry aPolygonOffsetTmp (hasDepthTest ? theCtx : Handle(OpenGl_Context)()); BackPolygonOffsetSentry aPolygonOffsetTmp (hasDepthTest ? theCtx.get() : NULL);
drawRect (theCtx, theTextAspect, theColorSubs); drawRect (theCtx, theTextAspect, theColorSubs);
break; break;
} }
case Aspect_TODT_DEKALE: case Aspect_TODT_DEKALE:
{ {
BackPolygonOffsetSentry aPolygonOffsetTmp (hasDepthTest ? theCtx : Handle(OpenGl_Context)()); BackPolygonOffsetSentry aPolygonOffsetTmp (hasDepthTest ? theCtx.get() : NULL);
theCtx->SetColor4fv (theColorSubs); theCtx->SetColor4fv (theColorSubs);
setupMatrix (theCtx, theTextAspect, OpenGl_Vec3 (+1.0f, +1.0f, 0.0f)); setupMatrix (theCtx, theTextAspect, OpenGl_Vec3 (+1.0f, +1.0f, 0.0f));
drawText (theCtx, theTextAspect); drawText (theCtx, theTextAspect);
@ -764,7 +764,7 @@ void OpenGl_Text::render (const Handle(OpenGl_Context)& theCtx,
} }
case Aspect_TODT_SHADOW: case Aspect_TODT_SHADOW:
{ {
BackPolygonOffsetSentry aPolygonOffsetTmp (hasDepthTest ? theCtx : Handle(OpenGl_Context)()); BackPolygonOffsetSentry aPolygonOffsetTmp (hasDepthTest ? theCtx.get() : NULL);
theCtx->SetColor4fv (theColorSubs); theCtx->SetColor4fv (theColorSubs);
setupMatrix (theCtx, theTextAspect, OpenGl_Vec3 (+1.0f, -1.0f, 0.0f)); setupMatrix (theCtx, theTextAspect, OpenGl_Vec3 (+1.0f, -1.0f, 0.0f));
drawText (theCtx, theTextAspect); drawText (theCtx, theTextAspect);

1
tests/parse.rules
View File

@ -7,3 +7,4 @@ FAILED /\b[Ff][Aa][Ii][Ll][0-9]\b/ error
FAILED /\b[Ff][Aa][Ii][Ll][Ee][Dd]\b/ error FAILED /\b[Ff][Aa][Ii][Ll][Ee][Dd]\b/ error
FAILED /\b[Ff][Aa][Ii][Ll][Uu][Rr][Ee]\b/ error FAILED /\b[Ff][Aa][Ii][Ll][Uu][Rr][Ee]\b/ error
FAILED /Process killed by CPU limit/ Killed by CPU limit FAILED /Process killed by CPU limit/ Killed by CPU limit
FAILED /Process killed by elapsed limit/ Killed by elapsed time limit