frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed a possible memory leak in creating fonts

Browse Source
This commit is contained in:
Klaus Schmidinger 2021-12-20 13:19:52 +01:00
parent f2e71eb668
commit e7107b789e
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -3668,6 +3668,7 @@ Helmut Binder <cco@aon.at>
for removing unused declaration of cDvbTuner::SetFrontendType() for removing unused declaration of cDvbTuner::SetFrontendType()
for fixing handling incomplete multi-packet CAT for fixing handling incomplete multi-packet CAT
for fixing a memory leak in handling the NIT for fixing a memory leak in handling the NIT
for reporting a possible memory leak in creating fonts
Ulrich Eckhardt <uli@uli-eckhardt.de> Ulrich Eckhardt <uli@uli-eckhardt.de>
for reporting a problem with shutdown after user inactivity in case a plugin is for reporting a problem with shutdown after user inactivity in case a plugin is

4
HISTORY
View File

@ -9746,3 +9746,7 @@ Video Disk Recorder Revision History
- Fixed unlocking vs. call to EpgHandlers.EndSegmentTransfer() (reported by Christoph - Fixed unlocking vs. call to EpgHandlers.EndSegmentTransfer() (reported by Christoph
Haubrich). Haubrich).
- Fixed a memory leak in handling the NIT (thanks to Helmut Binder). - Fixed a memory leak in handling the NIT (thanks to Helmut Binder).
2021-12-20:
- Fixed a possible memory leak in creating fonts (reported by Helmut Binder).

6
font.c
View File

@ -6,7 +6,7 @@
* *
* BiDi support by Osama Alrawab <alrawab@hotmail.com> @2008 Tripoli-Libya. * BiDi support by Osama Alrawab <alrawab@hotmail.com> @2008 Tripoli-Libya.
* *
* $Id: font.c 4.2 2016/12/22 12:31:23 kls Exp $ * $Id: font.c 5.1 2021/12/20 13:19:52 kls Exp $
*/ */
#include "font.h" #include "font.h"
@ -429,8 +429,10 @@ cFont *cFont::CreateFont(const char *Name, int CharHeight, int CharWidth)
{ {
cString fn = GetFontFileName(Name); cString fn = GetFontFileName(Name);
cFont *f = *fn ? new cFreetypeFont(fn, CharHeight, CharWidth) : NULL; cFont *f = *fn ? new cFreetypeFont(fn, CharHeight, CharWidth) : NULL;
if (!f || !f->Height()) if (!f || !f->Height()) {
delete f;
f = new cDummyFont(CharHeight, CharWidth); f = new cDummyFont(CharHeight, CharWidth);
}
return f; return f;
} }