Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
8c9418fb
Commit
8c9418fb
authored
Nov 02, 2021
by
Nikolay Sivov
Committed by
Alexandre Julliard
Nov 02, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dxva2: Limit allowed number of substreams in CreateVideoProcessor().
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
ef584679
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
main.c
dlls/dxva2/main.c
+6
-0
dxva2.c
dlls/dxva2/tests/dxva2.c
+0
-2
No files found.
dlls/dxva2/main.c
View file @
8c9418fb
...
@@ -496,6 +496,12 @@ static HRESULT WINAPI device_manager_processor_service_CreateVideoProcessor(IDir
...
@@ -496,6 +496,12 @@ static HRESULT WINAPI device_manager_processor_service_CreateVideoProcessor(IDir
/* FIXME: validate render target format */
/* FIXME: validate render target format */
if
(
max_substreams
>=
16
)
{
WARN
(
"Invalid substreams count %u.
\n
"
,
max_substreams
);
return
E_INVALIDARG
;
}
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
...
...
dlls/dxva2/tests/dxva2.c
View file @
8c9418fb
...
@@ -470,9 +470,7 @@ static void test_video_processor(void)
...
@@ -470,9 +470,7 @@ static void test_video_processor(void)
/* Number of substreams does not include reference stream. */
/* Number of substreams does not include reference stream. */
hr
=
IDirectXVideoProcessorService_CreateVideoProcessor
(
service
,
&
DXVA2_VideoProcSoftwareDevice
,
&
video_desc
,
hr
=
IDirectXVideoProcessorService_CreateVideoProcessor
(
service
,
&
DXVA2_VideoProcSoftwareDevice
,
&
video_desc
,
D3DFMT_A8R8G8B8
,
16
,
&
processor
);
D3DFMT_A8R8G8B8
,
16
,
&
processor
);
todo_wine
ok
(
hr
==
E_INVALIDARG
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
hr
==
E_INVALIDARG
,
"Unexpected hr %#x.
\n
"
,
hr
);
if
(
SUCCEEDED
(
hr
))
IDirectXVideoProcessor_Release
(
processor
);
hr
=
IDirectXVideoProcessorService_CreateVideoProcessor
(
service
,
&
DXVA2_VideoProcSoftwareDevice
,
&
video_desc
,
hr
=
IDirectXVideoProcessorService_CreateVideoProcessor
(
service
,
&
DXVA2_VideoProcSoftwareDevice
,
&
video_desc
,
D3DFMT_A8R8G8B8
,
15
,
&
processor
);
D3DFMT_A8R8G8B8
,
15
,
&
processor
);
...
...
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