Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-15 15:18:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32SS] Addendum to r74312 and r74309, fix some bad memory leaks. CORE-10876

Browse source 
Thanks Giannis and Thomas :)

svn path=/trunk/; revision=74316
This commit is contained in:
Mark Jansen 2017-04-14 21:22:18 +00:00
parent 645f25c4dd
commit 5657d83d0e
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/win32ss/gdi/ntgdi/freetype.c
View file

@ -2052,7 +2052,7 @@ IntGetFontLocalizedName(PUNICODE_STRING pNameW, FT_Face Face,
NTSTATUS Status = STATUS_NOT_FOUND; NTSTATUS Status = STATUS_NOT_FOUND;
ANSI_STRING AnsiName; ANSI_STRING AnsiName;
RtlInitUnicodeString(pNameW, NULL); RtlFreeUnicodeString(pNameW);
Count = FT_Get_Sfnt_Name_Count(Face); Count = FT_Get_Sfnt_Name_Count(Face);
for (i = 0; i < Count; ++i) for (i = 0; i < Count; ++i)
@ -2202,6 +2202,7 @@ FontFamilyFillInfo(PFONTFAMILYINFO Info, PCWSTR FaceName, PFONTGDI FontGDI)
else else
{ {
UNICODE_STRING NameW; UNICODE_STRING NameW;
RtlInitUnicodeString(&NameW, NULL);
status = IntGetFontLocalizedName(&NameW, Face, TT_NAME_ID_FONT_FAMILY, status = IntGetFontLocalizedName(&NameW, Face, TT_NAME_ID_FONT_FAMILY,
gusLanguageID); gusLanguageID);
if (NT_SUCCESS(status)) if (NT_SUCCESS(status))
@ -2640,6 +2641,7 @@ ftGdiGlyphCacheSet(
{ {
DPRINT1("Conversion failed\n"); DPRINT1("Conversion failed\n");
ExFreePoolWithTag(NewEntry, TAG_FONT); ExFreePoolWithTag(NewEntry, TAG_FONT);
FT_Bitmap_Done(GlyphSlot->library, &AlignedBitmap);
FT_Done_Glyph((FT_Glyph)BitmapGlyph); FT_Done_Glyph((FT_Glyph)BitmapGlyph);
return NULL; return NULL;
} }