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

OCC22105 Suspicious call to XOpenDisplay() in OSD_FontMgr class

Browse Source
This commit is contained in:
APL 2011-04-28 15:04:33 +00:00 committed by bugmaster
parent 82ac7cbbe7
commit 28e8503452
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/OSD/OSD_FontMgr.cxx
View File

@ -238,11 +238,16 @@ void OSD_FontMgr::InitFontDataBase() {
Handle(TCollection_HAsciiString) str = new TCollection_HAsciiString; Handle(TCollection_HAsciiString) str = new TCollection_HAsciiString;
Display * disp = XOpenDisplay("localhost:0.0"); Display * disp = XOpenDisplay("localhost:0.0");
if (!disp)
{
// let the X server find the available connection
disp = XOpenDisplay(":0.0");
if (!disp) if (!disp)
{ {
cout << "Display is NULL!" << endl; cout << "Display is NULL!" << endl;
return ; return ;
} }
}
Standard_Integer npaths = 0; Standard_Integer npaths = 0;

14
src/OpenGl/OpenGl_TextRender.cxx
View File

@ -298,12 +298,6 @@ void OpenGl_TextRender::RenderText ( char* str, GLuint base, int is2d, GLfloat x
TsmGetAttri( 1, &keyZoom ); TsmGetAttri( 1, &keyZoom );
zoom = keyZoom.data.ldata; zoom = keyZoom.data.ldata;
CMN_KEY keyfontName;
keyfontName.id = TelTextFont;//This flag responding about TextFontName
TsmGetAttri( 1, &keyfontName );
char *fontName = new char[strlen((char*)keyfontName.data.pdata) + 1];
strcpy(fontName,(char*)keyfontName.data.pdata);
OpenGl_TextRender* textRender = OpenGl_TextRender::instance(); OpenGl_TextRender* textRender = OpenGl_TextRender::instance();
int vh = 2 ; int vh = 2 ;
int vv = 2 ; int vv = 2 ;
@ -398,10 +392,17 @@ void OpenGl_TextRender::RenderText ( char* str, GLuint base, int is2d, GLfloat x
if ( renderMode == GL_FEEDBACK ) if ( renderMode == GL_FEEDBACK )
{ {
#ifdef HAVE_GL2PS #ifdef HAVE_GL2PS
CMN_KEY keyfontName;
keyfontName.id = TelTextFont;//This flag responding about TextFontName
TsmGetAttri( 1, &keyfontName );
char *fontName = new char[strlen((char*)keyfontName.data.pdata) + 1];
strcpy(fontName,(char*)keyfontName.data.pdata);
export_h = (GLdouble)fnt->FaceSize() / export_h; export_h = (GLdouble)fnt->FaceSize() / export_h;
int aligment = alignmentforgl2ps( vh, vv ); int aligment = alignmentforgl2ps( vh, vv );
glPopMatrix(); glPopMatrix();
ExportText( str, fontName, export_h, angle, aligment, x, y, z, is2d!=0 ); ExportText( str, fontName, export_h, angle, aligment, x, y, z, is2d!=0 );
delete [] fontName;
#endif #endif
} }
else else
@ -409,7 +410,6 @@ void OpenGl_TextRender::RenderText ( char* str, GLuint base, int is2d, GLfloat x
mgr->render_text( curFont, str ); mgr->render_text( curFont, str );
glPopMatrix(); glPopMatrix();
} }
delete [] fontName;
return; return;
} }