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

OCC22360 Writing out of allocated memory in the method OSD_FontMgr::InitFontDataBase

Browse Source
This commit is contained in:
MSV 2011-04-28 15:16:31 +00:00 committed by bugmaster
parent 8e3006e453
commit 5b181c6297
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/OSD/OSD_FontMgr.cxx
View File

@ -118,7 +118,7 @@ void OSD_FontMgr::InitFontDataBase() {
Standard_Size req_size; Standard_Size req_size;
req_size = strlen( getenv("windir") ); req_size = strlen( getenv("windir") );
windir_var = new Standard_Character[req_size]; windir_var = new Standard_Character[req_size + 1];
strcpy( windir_var, getenv("windir") ); strcpy( windir_var, getenv("windir") );
@ -238,15 +238,10 @@ 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) if ( !disp )
{ {
// let the X server find the available connection cout << "Display is NULL!" << endl;
disp = XOpenDisplay(":0.0"); return ;
if (!disp)
{
cout << "Display is NULL!" << endl;
return ;
}
} }
Standard_Integer npaths = 0; Standard_Integer npaths = 0;