ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dwrite: Handle allocation failure when duplicating reference key. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2017-04-20 12:50:07 +03:00 committed by Alexandre Julliard
parent 6f667d1c42
commit 5b07cfc13e
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dlls/dwrite/font.c
View File

@ -2,7 +2,7 @@
* Font and collections * Font and collections
* *
* Copyright 2011 Huw Davies * Copyright 2011 Huw Davies
* Copyright 2012, 2014-2016 Nikolay Sivov for CodeWeavers * Copyright 2012, 2014-2017 Nikolay Sivov for CodeWeavers
* Copyright 2014 Aric Stewart for CodeWeavers * Copyright 2014 Aric Stewart for CodeWeavers
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -4212,23 +4212,32 @@ static const IDWriteFontFileVtbl dwritefontfilevtbl = {
dwritefontfile_Analyze, dwritefontfile_Analyze,
}; };
HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_key, UINT32 key_size, IDWriteFontFile **font_file) HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_key, UINT32 key_size,
IDWriteFontFile **ret)
{ {
struct dwrite_fontfile *This; struct dwrite_fontfile *file;
void *key;
This = heap_alloc(sizeof(struct dwrite_fontfile)); *ret = NULL;
if (!This) return E_OUTOFMEMORY;
This->IDWriteFontFile_iface.lpVtbl = &dwritefontfilevtbl; file = heap_alloc(sizeof(*file));
This->ref = 1; key = heap_alloc(key_size);
if (!file || !key) {
heap_free(file);
heap_free(key);
return E_OUTOFMEMORY;
}
file->IDWriteFontFile_iface.lpVtbl = &dwritefontfilevtbl;
file->ref = 1;
IDWriteFontFileLoader_AddRef(loader); IDWriteFontFileLoader_AddRef(loader);
This->loader = loader; file->loader = loader;
This->stream = NULL; file->stream = NULL;
This->reference_key = heap_alloc(key_size); file->reference_key = key;
memcpy(This->reference_key, reference_key, key_size); memcpy(file->reference_key, reference_key, key_size);
This->key_size = key_size; file->key_size = key_size;
*font_file = &This->IDWriteFontFile_iface; *ret = &file->IDWriteFontFile_iface;
return S_OK; return S_OK;
} }