=?UTF-8?Q?Michael=20M=C3=BCller=20?=: msvideo.dll16: Check if any 16 bit thunks have been allocated before accessing pointer.
Alexandre Julliard
julliard at winehq.org
Thu Apr 20 12:35:11 CDT 2017
Module: wine
Branch: stable
Commit: 81ee50fd6aa89e76df0a3852a0e10a25787e5cc4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=81ee50fd6aa89e76df0a3852a0e10a25787e5cc4
Author: Michael Müller <michael at fds-team.de>
Date: Fri Feb 3 09:36:45 2017 +0100
msvideo.dll16: Check if any 16 bit thunks have been allocated before accessing pointer.
Signed-off-by: Michael Müller <michael at fds-team.de>
Signed-off-by: Sebastian Lackner <sebastian at fds-team.de>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit ea7cc6fc553ba25fe8acfc6d5a694c54cdbf9c68)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
dlls/msvideo.dll16/msvideo16.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/dlls/msvideo.dll16/msvideo16.c b/dlls/msvideo.dll16/msvideo16.c
index 28f126c..d390020 100644
--- a/dlls/msvideo.dll16/msvideo16.c
+++ b/dlls/msvideo.dll16/msvideo16.c
@@ -771,6 +771,9 @@ static struct msvideo_thunk* MSVIDEO_HasThunk(HIC16 hic)
{
struct msvideo_thunk* thunk;
+ if (!MSVIDEO_Thunks)
+ return NULL;
+
for (thunk = MSVIDEO_Thunks; thunk < &MSVIDEO_Thunks[MAX_THUNKS]; thunk++)
{
if (thunk->hIC16 == hic) return thunk;
More information about the wine-cvs
mailing list