Nikolay Sivov : dwrite: Initialize allocation size for a family before using it.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Oct 27 05:36:37 CDT 2014
Module: wine
Branch: master
Commit: 340aa07f60a12e1dab74e779786ace4c4ad7d329
URL: http://source.winehq.org/git/wine.git/?a=commit;h=340aa07f60a12e1dab74e779786ace4c4ad7d329
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Mon Oct 27 11:25:19 2014 +0300
dwrite: Initialize allocation size for a family before using it.
---
dlls/dwrite/font.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c
index d55e06d..708a6d8 100644
--- a/dlls/dwrite/font.c
+++ b/dlls/dwrite/font.c
@@ -56,8 +56,8 @@ struct dwrite_fontfamily_data {
IDWriteLocalizedStrings *familyname;
struct dwrite_font_data **fonts;
- UINT32 font_count;
- UINT32 alloc;
+ UINT32 font_count;
+ UINT32 font_alloc;
};
struct dwrite_fontcollection {
@@ -1440,16 +1440,16 @@ static HRESULT add_family_syscollection(struct dwrite_fontcollection *collection
static HRESULT fontfamily_add_font(struct dwrite_fontfamily_data *family_data, struct dwrite_font_data *font_data)
{
- if (family_data->font_count + 1 >= family_data->alloc) {
+ if (family_data->font_count + 1 >= family_data->font_alloc) {
struct dwrite_font_data **new_list;
UINT32 new_alloc;
- new_alloc = family_data->alloc * 2;
+ new_alloc = family_data->font_alloc * 2;
new_list = heap_realloc(family_data->fonts, sizeof(*family_data->fonts) * new_alloc);
if (!new_list)
return E_OUTOFMEMORY;
family_data->fonts = new_list;
- family_data->alloc = new_alloc;
+ family_data->font_alloc = new_alloc;
}
family_data->fonts[family_data->font_count] = font_data;
@@ -1558,16 +1558,16 @@ static HRESULT init_font_data(IDWriteFactory *factory, IDWriteFontFile *file, UI
static HRESULT init_fontfamily_data(IDWriteLocalizedStrings *familyname, struct dwrite_fontfamily_data *data)
{
- data->fonts = heap_alloc(sizeof(*data->fonts)*data->alloc);
+ data->ref = 1;
+ data->font_count = 0;
+ data->font_alloc = 2;
+
+ data->fonts = heap_alloc(sizeof(*data->fonts)*data->font_alloc);
if (!data->fonts) {
heap_free(data);
return E_OUTOFMEMORY;
}
- data->ref = 1;
- data->font_count = 0;
- data->alloc = 2;
-
data->familyname = familyname;
IDWriteLocalizedStrings_AddRef(familyname);
@@ -1761,7 +1761,7 @@ static HRESULT create_fontfamily(IDWriteLocalizedStrings *familyname, IDWriteFon
data->ref = 0;
data->font_count = 0;
- data->alloc = 2;
+ data->font_alloc = 2;
data->fonts = heap_alloc(sizeof(*data->fonts) * 2);
if (!data->fonts)
{
More information about the wine-cvs
mailing list