[PATCH] dwrite: Always initialize out pointers
Nikolay Sivov
nsivov at codeweavers.com
Fri Jan 15 03:12:24 CST 2016
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
dlls/dwrite/font.c | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c
index 0103fe4..a05cb29 100644
--- a/dlls/dwrite/font.c
+++ b/dlls/dwrite/font.c
@@ -3772,9 +3772,13 @@ static const IDWriteFontFileStreamVtbl localfontfilestreamvtbl =
localfontfilestream_GetLastWriteTime
};
-static HRESULT create_localfontfilestream(const void *file_ptr, UINT64 size, struct local_cached_stream *entry, IDWriteFontFileStream** iface)
+static HRESULT create_localfontfilestream(const void *file_ptr, UINT64 size, struct local_cached_stream *entry, IDWriteFontFileStream **ret)
{
- struct dwrite_localfontfilestream *This = heap_alloc(sizeof(struct dwrite_localfontfilestream));
+ struct dwrite_localfontfilestream *This;
+
+ *ret = NULL;
+
+ This = heap_alloc(sizeof(struct dwrite_localfontfilestream));
if (!This)
return E_OUTOFMEMORY;
@@ -3785,7 +3789,7 @@ static HRESULT create_localfontfilestream(const void *file_ptr, UINT64 size, str
This->size = size;
This->entry = entry;
- *iface = &This->IDWriteFontFileStream_iface;
+ *ret = &This->IDWriteFontFileStream_iface;
return S_OK;
}
@@ -3952,9 +3956,13 @@ static const struct IDWriteLocalFontFileLoaderVtbl localfontfileloadervtbl = {
localfontfileloader_GetLastWriteTimeFromKey
};
-HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface)
+HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader **ret)
{
- struct dwrite_localfontfileloader *This = heap_alloc(sizeof(struct dwrite_localfontfileloader));
+ struct dwrite_localfontfileloader *This;
+
+ *ret = NULL;
+
+ This = heap_alloc(sizeof(struct dwrite_localfontfileloader));
if (!This)
return E_OUTOFMEMORY;
@@ -3962,7 +3970,7 @@ HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface)
This->ref = 1;
list_init(&This->streams);
- *iface = &This->IDWriteLocalFontFileLoader_iface;
+ *ret = &This->IDWriteLocalFontFileLoader_iface;
return S_OK;
}
--
2.7.0.rc3
More information about the wine-patches
mailing list