Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
f1079fe1
Commit
f1079fe1
authored
Jun 13, 2016
by
Nikolay Sivov
Committed by
Alexandre Julliard
Jun 14, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dwrite: Fix invalid read when building zero length text layout (Valgrind).
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
6ea86fae
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
layout.c
dlls/dwrite/layout.c
+3
-2
No files found.
dlls/dwrite/layout.c
View file @
f1079fe1
...
...
@@ -727,7 +727,7 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout)
free_layout_runs
(
layout
);
/* Cluster data arrays are allocated once, assuming one text position per cluster. */
if
(
!
layout
->
clustermetrics
)
{
if
(
!
layout
->
clustermetrics
&&
layout
->
len
)
{
layout
->
clustermetrics
=
heap_alloc
(
layout
->
len
*
sizeof
(
*
layout
->
clustermetrics
));
layout
->
clusters
=
heap_alloc
(
layout
->
len
*
sizeof
(
*
layout
->
clusters
));
if
(
!
layout
->
clustermetrics
||
!
layout
->
clusters
)
{
...
...
@@ -1694,12 +1694,13 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout)
layout
->
metrics
.
lineCount
=
0
;
origin_x
=
is_rtl
?
layout
->
metrics
.
layoutWidth
:
0
.
0
f
;
line
=
0
;
run
=
layout
->
clusters
[
0
].
run
;
memset
(
&
metrics
,
0
,
sizeof
(
metrics
));
layout_splitting_params_from_pos
(
layout
,
0
,
&
params
);
prev_params
=
params
;
if
(
layout
->
cluster_count
)
run
=
layout
->
clusters
[
0
].
run
;
for
(
i
=
0
,
start
=
0
,
textpos
=
0
,
width
=
0
.
0
f
;
i
<
layout
->
cluster_count
;
i
++
)
{
BOOL
overflow
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment