nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed memory leak when XCreateImage fail, thanks php-coder

Browse source
This commit is contained in:
fluxgen 2006-03-14 20:19:33 +00:00
parent ddd2233f5a
commit 0530d278e7
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/FbTk/XFontImp.cc
View file

@ -221,7 +221,7 @@ void XFontImp::rotate(float angle) {
boxlen/2 - descent, text, 1); boxlen/2 - descent, text, 1);
// reserve memory for first XImage // reserve memory for first XImage
vertdata = new unsigned char[vert_len * vert_h]; vertdata = (unsigned char *)calloc((unsigned)(vert_len * vert_h), 1);
XImage *I1 = XCreateImage(dpy, DefaultVisual(dpy, screen), XImage *I1 = XCreateImage(dpy, DefaultVisual(dpy, screen),
1, XYBitmap, 1, XYBitmap,
@ -229,7 +229,11 @@ void XFontImp::rotate(float angle) {
vert_w, vert_h, 8, 0); vert_w, vert_h, 8, 0);
if (I1 == None) { if (I1 == None) {
cerr<<"RotFont: "<<_FBTKTEXT(Error, CreateXImage, "Cant create XImage", "XCreateImage failed for some reason")<<"."<<endl; cerr<<"RotFont: "<<_FBTKTEXT(Error, CreateXImage,
"Cant create XImage",
"XCreateImage failed for some reason")
<<"."<<endl;
free(vertdata);
delete m_rotfont; delete m_rotfont;
m_rotfont = 0; m_rotfont = 0;
return; return;
@ -267,7 +271,11 @@ void XFontImp::rotate(float angle) {
(char *)bitdata, bit_w, bit_h, 8, 0); (char *)bitdata, bit_w, bit_h, 8, 0);
if (I2 == None) { if (I2 == None) {
cerr<<"XFontImp: "<<_FBTKTEXT(Error, CreateXImage, "Cant create XImage", "XCreateImage failed for some reason")<<"."<<endl; cerr<<"XFontImp: "<<_FBTKTEXT(Error, CreateXImage,
"Cant create XImage",
"XCreateImage failed for some reason")
<<"."<<endl;
free(bitdata);
delete m_rotfont; delete m_rotfont;
m_rotfont = 0; m_rotfont = 0;
return; return;