From 938f2286997d393086c2139121550ee68539af88 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sun, 28 Dec 2014 13:05:48 +0000 Subject: [PATCH] [MSI] - Apply Wine commit f41ac94e (msi: Include the terminating null in the buffer size for decoded stream names.) by Hans Leidekker. Fixes a stack buffer overflow when installing VMware Tools. svn path=/trunk/; revision=65859 --- reactos/dll/win32/msi/database.c | 2 +- reactos/dll/win32/msi/streams.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/reactos/dll/win32/msi/database.c b/reactos/dll/win32/msi/database.c index a73317c1c2f..66b79f99b48 100644 --- a/reactos/dll/win32/msi/database.c +++ b/reactos/dll/win32/msi/database.c @@ -113,7 +113,7 @@ UINT msi_get_raw_stream( MSIDATABASE *db, LPCWSTR stname, IStream **stm ) { HRESULT r; IStorage *stg; - WCHAR decoded[MAX_STREAM_NAME_LEN]; + WCHAR decoded[MAX_STREAM_NAME_LEN + 1]; decode_streamname( stname, decoded ); TRACE("%s -> %s\n", debugstr_w(stname), debugstr_w(decoded)); diff --git a/reactos/dll/win32/msi/streams.c b/reactos/dll/win32/msi/streams.c index c4cee864640..8b46565bab3 100644 --- a/reactos/dll/win32/msi/streams.c +++ b/reactos/dll/win32/msi/streams.c @@ -56,7 +56,7 @@ static BOOL streams_set_table_size(MSISTREAMSVIEW *sv, UINT size) static STREAM *create_stream(MSISTREAMSVIEW *sv, LPCWSTR name, BOOL encoded, IStream *stm) { STREAM *stream; - WCHAR decoded[MAX_STREAM_NAME_LEN]; + WCHAR decoded[MAX_STREAM_NAME_LEN + 1]; stream = msi_alloc(sizeof(STREAM)); if (!stream)