Skip to content

W
wine-winehq
Commit 412b36e4 authored by Esme Povirk's avatar Esme Povirk Committed by Alexandre Julliard
Browse files
Options

dwrite: Avoid calling memcpy with NULL source.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52187Signed-off-by: 's avatarEsme Povirk <esme@codeweavers.com> Signed-off-by: 's avatarNikolay Sivov <nsivov@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 4ef48646
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 2 deletions
dlls/dwrite/analyzer.c
View file @ 412b36e4
......@@ -868,7 +868,8 @@ static HRESULT get_text_source_ptr(IDWriteTextAnalysisSource *source, UINT32 pos
*buff = malloc(length * sizeof(WCHAR));
if (!*buff)
return E_OUTOFMEMORY;
memcpy(*buff, *text, len*sizeof(WCHAR));
if (*text)
memcpy(*buff, *text, len*sizeof(WCHAR));
read = len;
while (read < length && *text) {
......@@ -880,6 +881,8 @@ static HRESULT get_text_source_ptr(IDWriteTextAnalysisSource *source, UINT32 pos
free(*buff);
return hr;
}
if (!*text)
break;
memcpy(*buff + read, *text, min(len, length-read)*sizeof(WCHAR));
read += len;
}
......@@ -1009,7 +1012,8 @@ static HRESULT WINAPI dwritetextanalyzer_AnalyzeLineBreakpoints(IDWriteTextAnaly
if (!(buff = calloc(length, sizeof(*buff))))
return E_OUTOFMEMORY;
memcpy(buff, text, len*sizeof(WCHAR));
if (text)
memcpy(buff, text, len*sizeof(WCHAR));
read = len;
while (read < length && text) {
......@@ -1018,6 +1022,8 @@ static HRESULT WINAPI dwritetextanalyzer_AnalyzeLineBreakpoints(IDWriteTextAnaly
hr = IDWriteTextAnalysisSource_GetTextAtPosition(source, read, &text, &len);
if (FAILED(hr))
goto done;
if (!text)
break;
memcpy(&buff[read], text, min(len, length-read)*sizeof(WCHAR));
read += len;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment