From 1aaf583c9f831fa5b6ac4728dc88bb631ca66886 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Thu, 25 Jun 2015 07:47:08 +0200 Subject: [PATCH] msvcrt-atof_strtod: Disable patchset, its already fixed upstream. (The tests and a fix for a corner case might still be useful, so leaving the patch there for now.) --- README.md | 2 +- debian/changelog | 2 ++ patches/msvcrt-atof_strtod/definition | 3 ++- patches/patchinstall.sh | 19 ------------------- 4 files changed, 5 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 951a07c4..9c420614 100644 --- a/README.md +++ b/README.md @@ -210,7 +210,7 @@ for more details.* * Initialize System\CurrentControlSet\Control\TimeZoneInformation registry keys * Jedi Knight: Dark Forces II crashes with winmm set to native ([Wine Bug #37983](https://bugs.winehq.org/show_bug.cgi?id=37983)) * Lego Stunt Rally requires DXTn software de/encoding support ([Wine Bug #25486](https://bugs.winehq.org/show_bug.cgi?id=25486)) -* MSVCRT crashes when NULL is passed as string to atof or strtod ([Wine Bug #32550](https://bugs.winehq.org/show_bug.cgi?id=32550)) +* ~~MSVCRT crashes when NULL is passed as string to atof or strtod~~ ([Wine Bug #32550](https://bugs.winehq.org/show_bug.cgi?id=32550)) * MSYS2 expects correct handling of WRITECOPY memory protection ([Wine Bug #35561](https://bugs.winehq.org/show_bug.cgi?id=35561)) * Make it possible to change media center / tablet pc status ([Wine Bug #18732](https://bugs.winehq.org/show_bug.cgi?id=18732)) * MediaCoder needs CUDA for video encoding ([Wine Bug #37664](https://bugs.winehq.org/show_bug.cgi?id=37664)) diff --git a/debian/changelog b/debian/changelog index d97e71ba..7510faa4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ wine-staging (1.7.46) UNRELEASED; urgency=low instruction on x86_64. * Updated patchset ntdll-WRITECOPY to be compatible with OSX (fixes Wine Staging Bug #399). + * Disable patch to avoid crash when NULL pointer is passed to atof / strtod + functions (fixed upstream). * Removed patch for implementation of GdipCreateRegionRgnData (accepted upstream). * Removed patch to fix output buffer size for IOCTL_DVD_READ_STRUCTURE diff --git a/patches/msvcrt-atof_strtod/definition b/patches/msvcrt-atof_strtod/definition index 35ea48d4..9e916742 100644 --- a/patches/msvcrt-atof_strtod/definition +++ b/patches/msvcrt-atof_strtod/definition @@ -1 +1,2 @@ -Fixes: [32550] MSVCRT crashes when NULL is passed as string to atof or strtod +# Fixes: [32550] MSVCRT crashes when NULL is passed as string to atof or strtod +Disabled: True diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 161cb50b..b6e95a6e 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -150,7 +150,6 @@ patch_enable_all () enable_mscoree_CorValidateImage="$1" enable_msvcp90_basic_string_dtor="$1" enable_msvcrt_Math_Precision="$1" - enable_msvcrt_atof_strtod="$1" enable_msvfw32_Image_Size="$1" enable_ntdll_APC_Performance="$1" enable_ntdll_APC_Start_Process="$1" @@ -526,9 +525,6 @@ patch_enable () msvcrt-Math_Precision) enable_msvcrt_Math_Precision="$2" ;; - msvcrt-atof_strtod) - enable_msvcrt_atof_strtod="$2" - ;; msvfw32-Image_Size) enable_msvfw32_Image_Size="$2" ;; @@ -3326,21 +3322,6 @@ if test "$enable_msvcrt_Math_Precision" -eq 1; then ) >> "$patchlist" fi -# Patchset msvcrt-atof_strtod -# | -# | This patchset fixes the following Wine bugs: -# | * [#32550] MSVCRT crashes when NULL is passed as string to atof or strtod -# | -# | Modified files: -# | * dlls/msvcrt/string.c, dlls/msvcrt/tests/string.c -# | -if test "$enable_msvcrt_atof_strtod" -eq 1; then - patch_apply msvcrt-atof_strtod/0001-msvcrt-Avoid-crash-when-NULL-pointer-is-passed-to-at.patch - ( - echo '+ { "Michael Müller", "msvcrt: Avoid crash when NULL pointer is passed to atof / strtod functions.", 1 },'; - ) >> "$patchlist" -fi - # Patchset msvfw32-Image_Size # | # | This patchset fixes the following Wine bugs: