wine-commits October 2014

wine-commits@winehq.org

2 participants
397 discussions

Michael Stefaniuc : avifil32: Simplify comparing two unsigned ints ( PVS-Studio).
by Alexandre Julliard 28 Oct '14

28 Oct '14

Module: wine Branch: master Commit: 2bf09a9d25dc9b29e8f96e36c71c8256645ec994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bf09a9d25dc9b29e8f96e36c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 27 20:03:33 2014 +0100 avifil32: Simplify comparing two unsigned ints (PVS-Studio). --- dlls/avifil32/editstream.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c index 6d38725..3aa8637 100644 --- a/dlls/avifil32/editstream.c +++ b/dlls/avifil32/editstream.c @@ -169,10 +169,9 @@ static HRESULT AVIFILE_RemoveStream(IAVIEditStreamImpl* const This, DWORD nr) /* remove part nr */ IAVIStream_Release(This->pStreams[nr].pStream); This->nStreams--; - if (This->nStreams - nr > 0) { - memmove(This->pStreams + nr, This->pStreams + nr + 1, - (This->nStreams - nr) * sizeof(EditStreamTable)); - } + if (nr < This->nStreams) + memmove(&This->pStreams[nr], &This->pStreams[nr + 1], + (This->nStreams - nr) * sizeof(This->pStreams[0])); This->pStreams[This->nStreams].pStream = NULL; This->pStreams[This->nStreams].dwStart = 0; This->pStreams[This->nStreams].dwLength = 0;

1 0

Michael Stefaniuc : oleaut32: Clarify cast operation (PVS-Studio).
by Alexandre Julliard 28 Oct '14

28 Oct '14

Module: wine Branch: master Commit: 39eede134ea938ff40cba4dab2340bf1a7843e45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39eede134ea938ff40cba4dab… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 27 20:01:37 2014 +0100 oleaut32: Clarify cast operation (PVS-Studio). --- dlls/oleaut32/typelib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 48b171b..00f5043 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -9144,7 +9144,7 @@ static DWORD WMSFT_append_arraydesc(ARRAYDESC *desc, WMSFT_TLBFile *file) file->arraydesc_seg.data = heap_alloc(file->arraydesc_seg.len); else file->arraydesc_seg.data = heap_realloc(file->arraydesc_seg.data, file->arraydesc_seg.len); - encoded = (DWORD*)((char *)file->arraydesc_seg.data) + offs; + encoded = (DWORD*)((char *)file->arraydesc_seg.data + offs); encoded[0] = WMSFT_append_typedesc(&desc->tdescElem, file, NULL, NULL); encoded[1] = desc->cDims | ((desc->cDims * 2 * sizeof(DWORD)) << 16);

1 0

Daniel Lehman : wininet: Remove custom port handling in HTTP_HandleRedirect.
by Alexandre Julliard 28 Oct '14

28 Oct '14

Module: wine Branch: master Commit: f3455da6ffda6f1e7d70f82a4dbb7afcc200e053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3455da6ffda6f1e7d70f82a4… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Oct 24 07:43:00 2014 -0700 wininet: Remove custom port handling in HTTP_HandleRedirect. --- dlls/wininet/http.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 40f8d9a..a98ed53 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4173,20 +4173,9 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) heap_free(session->hostName); - if(custom_port) { - int len; - static const WCHAR fmt[] = {'%','s',':','%','u',0}; - len = lstrlenW(hostName); - len += 7; /* 5 for strlen("65535") + 1 for ":" + 1 for '\0' */ - session->hostName = heap_alloc(len*sizeof(WCHAR)); - sprintfW(session->hostName, fmt, hostName, urlComponents.nPort); - } - else - session->hostName = heap_strdupW(hostName); + session->hostName = heap_strdupW(hostName); session->hostPort = urlComponents.nPort; - HTTP_ProcessHeader(request, hostW, session->hostName, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); - heap_free(session->userName); session->userName = NULL; if (userName[0]) @@ -4201,6 +4190,11 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) server_release(request->server); request->server = new_server; } + + if (custom_port) + HTTP_ProcessHeader(request, hostW, request->server->host_port, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); + else + HTTP_ProcessHeader(request, hostW, request->server->name, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); } heap_free(request->path); request->path=NULL;

1 0

Jeremy Newman : set open graph images for announcements and wwn
by Jeremy Newman 27 Oct '14

27 Oct '14

Module: website Branch: master Commit: 92be36f05cd1609f91e46fe9842cf1aa8255fe95 URL: http://source.winehq.org/git/website.git/?a=commit;h=92be36f05cd1609f91e46f… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Oct 27 09:38:07 2014 -0500 set open graph images for announcements and wwn --- templates/en/announce.template | 1 + templates/en/wwn.template | 1 + 2 files changed, 2 insertions(+) diff --git a/templates/en/announce.template b/templates/en/announce.template index 0f82da6..cbe2efa 100644 --- a/templates/en/announce.template +++ b/templates/en/announce.template @@ -1,5 +1,6 @@   + <h1 class="title">Wine Announcement</h1> diff --git a/templates/en/wwn.template b/templates/en/wwn.template index 9135c58..a6a5ba3 100644 --- a/templates/en/wwn.template +++ b/templates/en/wwn.template @@ -1,5 +1,6 @@   + <h1 class="title">World Wine News</h1> <div style="font-size: x-small; margin-top: 0;">All the news that fits, we print.</div>

1 0

Iván Matellanes : msvcrt: Added _fflush_nolock implementation.
by Alexandre Julliard 27 Oct '14

27 Oct '14

Module: wine Branch: master Commit: 4bb80afedcca6bdc510574488258ef1a16e4167f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bb80afedcca6bdc510574488… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Oct 20 21:03:16 2014 +0200 msvcrt: Added _fflush_nolock implementation. Thanks to Piotr Caban for the test. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcr90/tests/msvcr90.c | 20 ++++++++++++++++++++ dlls/msvcrt/file.c | 24 +++++++++++++++++++----- dlls/msvcrt/msvcrt.h | 1 + include/msvcrt/stdio.h | 1 + 8 files changed, 45 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 6a36661..9b6de75 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -799,7 +799,7 @@ @ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s @ cdecl _fdopen(long str) MSVCRT__fdopen -@ stub _fflush_nolock +@ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock @ cdecl _fgetchar() MSVCRT__fgetchar @ stub _fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index d6b1a18..cf7beb5 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1147,7 +1147,7 @@ @ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s @ cdecl _fdopen(long str) MSVCRT__fdopen -@ stub _fflush_nolock +@ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock @ cdecl _fgetchar() MSVCRT__fgetchar @ stub _fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 237539b..bb26bcc 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -466,7 +466,7 @@ @ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s @ cdecl _fdopen(long str) MSVCRT__fdopen -@ stub _fflush_nolock +@ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock @ cdecl _fgetchar() MSVCRT__fgetchar @ stub _fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b810c5f..34a90e6 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -448,7 +448,7 @@ @ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s @ cdecl _fdopen(long str) MSVCRT__fdopen -@ stub _fflush_nolock +@ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock @ cdecl _fgetchar() MSVCRT__fgetchar @ stub _fgetwc_nolock @ cdecl _fgetwchar() MSVCRT__fgetwchar diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 0a81edc..9bb29da 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -121,6 +121,7 @@ static int (__cdecl *p_flsbuf)(int, FILE*); static unsigned long (__cdecl *p_byteswap_ulong)(unsigned long); static void** (__cdecl *p__pxcptinfoptrs)(void); static void* (__cdecl *p__AdjustPointer)(void*, const void*); +static int (__cdecl *p_fflush_nolock)(FILE*); /* make sure we use the correct errno */ #undef errno @@ -379,6 +380,7 @@ static BOOL init(void) SET(p_byteswap_ulong, "_byteswap_ulong"); SET(p__pxcptinfoptrs, "__pxcptinfoptrs"); SET(p__AdjustPointer, "__AdjustPointer"); + SET(p_fflush_nolock, "_fflush_nolock"); if (sizeof(void *) == 8) { SET(p_type_info_name_internal_method, "?_name_internal_method@type_info@@QEBAPEBDPEAU__type_info_node@@@Z"); @@ -1207,16 +1209,22 @@ struct block_file_arg FILE *write; HANDLE init; HANDLE finish; + int deadlock_test; }; static DWORD WINAPI block_file(void *arg) { struct block_file_arg *files = arg; + int deadlock_test; p_lock_file(files->read); p_lock_file(files->write); SetEvent(files->init); + WaitForSingleObject(files->finish, INFINITE); + Sleep(200); + deadlock_test = InterlockedIncrement(&files->deadlock_test); + ok(deadlock_test == 1, "deadlock_test = %d\n", deadlock_test); p_unlock_file(files->read); p_unlock_file(files->write); return 0; @@ -1250,6 +1258,7 @@ static void test_nonblocking_file_access(void) arg.write = filew; arg.init = CreateEventW(NULL, FALSE, FALSE, NULL); arg.finish = CreateEventW(NULL, FALSE, FALSE, NULL); + arg.deadlock_test = 0; ok(arg.init != NULL, "CreateEventW failed\n"); ok(arg.finish != NULL, "CreateEventW failed\n"); thread = CreateThread(NULL, 0, block_file, (void*)&arg, 0, NULL); @@ -1276,7 +1285,18 @@ static void test_nonblocking_file_access(void) ret = p_flsbuf('a', filew); ok(ret=='a', "_flsbuf(filew) returned %d\n", ret); + ret = p_fflush_nolock(filer); + ok(ret==0, "_fflush_nolock(filer) returned %d\n", ret); + ret = p_fflush_nolock(filew); + ok(ret==0, "_fflush_nolock(filew) returned %d\n", ret); + SetEvent(arg.finish); + + ret = p_fflush_nolock(NULL); + ok(ret==0, "_fflush_nolock(NULL) returned %d\n", ret); + ret = InterlockedIncrement(&arg.deadlock_test); + ok(ret==2, "InterlockedIncrement returned %d\n", ret); + WaitForSingleObject(thread, INFINITE); CloseHandle(arg.init); CloseHandle(arg.finish); diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 2dd4da5..2e07342 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -919,24 +919,38 @@ int CDECL MSVCRT__flushall(void) */ int CDECL MSVCRT_fflush(MSVCRT_FILE* file) { + int ret; + + if(!file) { + msvcrt_flush_all_buffers(MSVCRT__IOWRT); + ret = 0; + } else { + MSVCRT__lock_file(file); + ret = MSVCRT__fflush_nolock(file); + MSVCRT__unlock_file(file); + } + + return ret; +} + +/********************************************************************* + * _fflush_nolock (MSVCRT.@) + */ +int CDECL MSVCRT__fflush_nolock(MSVCRT_FILE* file) +{ if(!file) { msvcrt_flush_all_buffers(MSVCRT__IOWRT); } else if(file->_flag & MSVCRT__IOWRT) { int res; - MSVCRT__lock_file(file); res = msvcrt_flush_buffer(file); - if(!res && (file->_flag & MSVCRT__IOCOMMIT)) res = MSVCRT__commit(file->_file) ? MSVCRT_EOF : 0; - MSVCRT__unlock_file(file); return res; } else if(file->_flag & MSVCRT__IOREAD) { - MSVCRT__lock_file(file); file->_cnt = 0; file->_ptr = file->_base; - MSVCRT__unlock_file(file); return 0; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 85484bc..9f00923 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -931,6 +931,7 @@ MSVCRT_size_t __cdecl MSVCRT__fread_nolock(void*,MSVCRT_size_t,MSVCRT_size_t,MSV MSVCRT_size_t __cdecl MSVCRT__fwrite_nolock(const void*,MSVCRT_size_t,MSVCRT_size_t,MSVCRT_FILE*); int __cdecl MSVCRT_fclose(MSVCRT_FILE*); int __cdecl MSVCRT__fclose_nolock(MSVCRT_FILE*); +int __cdecl MSVCRT__fflush_nolock(MSVCRT_FILE*); void __cdecl MSVCRT_terminate(void); MSVCRT_FILE* __cdecl MSVCRT__iob_func(void); MSVCRT_clock_t __cdecl MSVCRT_clock(void); diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 1c154fc..305d251 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -130,6 +130,7 @@ int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list); size_t __cdecl _fread_nolock(void*,size_t,size_t,FILE*); size_t __cdecl _fwrite_nolock(const void*,size_t,size_t,FILE*); int __cdecl _fclose_nolock(FILE*); +int __cdecl _fflush_nolock(FILE*); int __cdecl _fseek_nolock(FILE*,__msvcrt_long,int); int __cdecl _fseeki64_nolock(FILE*,__int64,int); __msvcrt_long __cdecl _ftell_nolock(FILE*);

1 0

Stefan Dösinger : wined3d: Update AMD drivers.
by Alexandre Julliard 27 Oct '14

27 Oct '14

Module: wine Branch: master Commit: c35f0161c0803a4f16c963f4ba06cb2077202386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c35f0161c0803a4f16c963f4b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 24 11:28:57 2014 +0200 wined3d: Update AMD drivers. --- dlls/wined3d/directx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a10d60e..d428d94 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1166,9 +1166,9 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_AMD_RAGE_128PRO, DRIVER_MODEL_NT5X, "ati2dvaa.dll", 13, 3279, 0}, {DRIVER_AMD_R100, DRIVER_MODEL_NT5X, "ati2dvag.dll", 14, 10, 6614}, {DRIVER_AMD_R300, DRIVER_MODEL_NT5X, "ati2dvag.dll", 14, 10, 6764}, - {DRIVER_AMD_R600, DRIVER_MODEL_NT5X, "ati2dvag.dll", 14, 10, 8681}, + {DRIVER_AMD_R600, DRIVER_MODEL_NT5X, "ati2dvag.dll", 17, 10, 1280}, {DRIVER_AMD_R300, DRIVER_MODEL_NT6X, "atiumdag.dll", 14, 10, 741 }, - {DRIVER_AMD_R600, DRIVER_MODEL_NT6X, "atiumdag.dll", 14, 10, 741 }, + {DRIVER_AMD_R600, DRIVER_MODEL_NT6X, "atiumdag.dll", 17, 10, 1280 }, /* Intel * The drivers are unified but not all versions support all GPUs. At some point the 2k/xp

1 0

Stefan Dösinger : wined3d: Update Nvidia driver versions.
by Alexandre Julliard 27 Oct '14

27 Oct '14

Module: wine Branch: master Commit: a4443a97a7a8e89a91ccd7b8f4b426dd61f0780a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4443a97a7a8e89a91ccd7b8f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 24 11:28:56 2014 +0200 wined3d: Update Nvidia driver versions. --- dlls/wined3d/directx.c | 138 +++++++++++++++++++++++++------------------------ 1 file changed, 71 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a4443a97a7a8e89a91ccd…

1 0

Sebastian Lackner : kernel32/tests: Avoid crashing when exception info[0] contains wrong value.
by Alexandre Julliard 27 Oct '14

27 Oct '14

Module: wine Branch: master Commit: d4d8efad467ab593681f5dad300d9d5a750b42b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4d8efad467ab593681f5dad3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 24 02:03:40 2014 +0200 kernel32/tests: Avoid crashing when exception info[0] contains wrong value. --- dlls/kernel32/tests/virtual.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 98ef703..1e66ee1 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -2130,8 +2130,7 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) vectored_handler = pRtlAddVectoredExceptionHandler( TRUE, &execute_fault_vec_handler ); ok( vectored_handler != 0, "RtlAddVectoredExceptionHandler failed\n" ); - num_execute_fault_calls = 0; - ret = SendMessageA( hWnd, WM_USER, 0, 0 ); + ret = send_message_excpt( hWnd, WM_USER, 0, 0 ); pRtlRemoveVectoredExceptionHandler( vectored_handler );

1 0

Alexandre Julliard : msvcp90: Add inline wrappers for the memcpy_s/ memmove_s/mbstowcs_s functions.
by Alexandre Julliard 27 Oct '14

27 Oct '14

Module: wine Branch: master Commit: 4b1aba754e5aab84fe74f595fb305f5293a29589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b1aba754e5aab84fe74f595f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 27 17:47:03 2014 +0900 msvcp90: Add inline wrappers for the memcpy_s/memmove_s/mbstowcs_s functions. --- dlls/msvcp90/msvcp90.h | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 0a60d46..d7c0a31 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -562,8 +562,23 @@ typedef struct { } complex_double; #if _MSVCP_VER < 80 -#define memcpy_s( dst, size, src, count ) (memcpy( (dst), (src), (count) ), 0) -#define memmove_s( dst, size, src, count ) (memmove( (dst), (src), (count) ), 0) -#define mbstowcs_s( ret, wcs, size, mbs, count ) (mbstowcs( (wcs), (mbs), (count) ), 0) +static inline int memcpy_wrapper( void *dst, size_t size, const void *src, size_t count ) +{ + memcpy( dst, src, count ); + return 0; +} +static inline int memmove_wrapper( void *dst, size_t size, const void *src, size_t count ) +{ + memmove( dst, src, count ); + return 0; +} +static inline int mbstowcs_wrapper( size_t *ret, wchar_t *wcs, size_t size, const char *mbs, size_t count ) +{ + mbstowcs( wcs, mbs, count ); + return 0; +} +#define memcpy_s( dst, size, src, count ) memcpy_wrapper( dst, size, src, count ) +#define memmove_s( dst, size, src, count ) memmove_wrapper( dst, size, src, count ) +#define mbstowcs_s( ret, wcs, size, mbs, count ) mbstowcs_wrapper( ret, wcs, size, mbs, count ) #define hypotf( x, y ) ((float)hypot( (double)(x), (double)(y) )) #endif

1 0

Alexandre Julliard : xcopy: Avoid a potential out of bounds access.
by Alexandre Julliard 27 Oct '14

27 Oct '14

Module: wine Branch: master Commit: 7711f494e39432984b177e0a18a204dd75bc4cb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7711f494e39432984b177e0a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 27 17:46:38 2014 +0900 xcopy: Avoid a potential out of bounds access. --- programs/xcopy/xcopy.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 7ff751c..2134a5e 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -271,11 +271,9 @@ static BOOL XCOPY_ProcessExcludeFile(WCHAR* filename, WCHAR* endOfName) { EXCLUDELIST *thisEntry; int length = lstrlenW(buffer); - /* Strip CRLF */ - buffer[length-1] = 0x00; - /* If more than CRLF */ if (length > 1) { + buffer[length-1] = 0; /* strip CRLF */ thisEntry = HeapAlloc(GetProcessHeap(), 0, sizeof(EXCLUDELIST)); thisEntry->next = excludeList; excludeList = thisEntry;

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
40
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2014