wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Removed several patches (accepted upstream).

Browse Source
This commit is contained in:
Sebastian Lackner
2014-12-23 23:07:04 +01:00
parent 981ea8facf
commit b6a21b238f
5 changed files with 26 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/msvcrt-atof_strtod/0001-msvcrt-Avoid-crash-when-NULL-pointer-is-passed-to-at.patch
View File

@@ -1,4 +1,4 @@
From e600a4020ee684f73376d5c7389e6326291d3f1b Mon Sep 17 00:00:00 2001
From 59b1380d74f70b875c9e4642131b0fdbf06ec820 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 8 Nov 2014 22:39:28 +0100
Subject: msvcrt: Avoid crash when NULL pointer is passed to atof / strtod
@@ -27,7 +27,7 @@ index 6f9280f..d933643 100644
}
diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c
index 1788035..5620c6d 100644
index e2d53d4..d40d8d8 100644
--- a/dlls/msvcrt/tests/string.c
+++ b/dlls/msvcrt/tests/string.c
@@ -89,6 +89,8 @@ static int (__cdecl *p_tolower)(int);
@@ -37,9 +37,9 @@ index 1788035..5620c6d 100644
+static double (__cdecl *p__atof_l)(const char*,_locale_t);
+static double (__cdecl *p__strtod_l)(const char *,char**,_locale_t);
static int (__cdecl *p__strnset_s)(char*,size_t,int,size_t);
static int (__cdecl *p__wcsset_s)(wchar_t*,size_t,wchar_t);
#define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y)
@@ -1552,6 +1554,31 @@ static void test__strtod(void)
@@ -1553,6 +1555,31 @@ static void test__strtod(void)
char *end;
double d;
@@ -71,7 +71,7 @@ index 1788035..5620c6d 100644
d = strtod(double1, &end);
ok(almost_equal(d, 12.1), "d = %lf\n", d);
ok(end == double1+4, "incorrect end (%d)\n", (int)(end-double1));
@@ -2609,6 +2636,11 @@ static void test_atoi(void)
@@ -2610,6 +2637,11 @@ static void test_atoi(void)
{
int r;
@@ -83,7 +83,7 @@ index 1788035..5620c6d 100644
r = atoi("0");
ok(r == 0, "atoi(0) = %d\n", r);
@@ -2622,6 +2654,35 @@ static void test_atoi(void)
@@ -2623,6 +2655,35 @@ static void test_atoi(void)
ok(r == 0, "atoi(4294967296) = %d\n", r);
}
@@ -119,16 +119,16 @@ index 1788035..5620c6d 100644
static void test_strncpy(void)
{
#define TEST_STRNCPY_LEN 10
@@ -2796,6 +2857,8 @@ START_TEST(string)
@@ -2831,6 +2892,8 @@ START_TEST(string)
p_mbrtowc = (void*)GetProcAddress(hMsvcrt, "mbrtowc");
p_mbsrtowcs = (void*)GetProcAddress(hMsvcrt, "mbsrtowcs");
p__atodbl_l = (void*)GetProcAddress(hMsvcrt, "_atodbl_l");
+ p__atof_l = (void*)GetProcAddress(hMsvcrt, "_atof_l");
+ p__strtod_l = (void*)GetProcAddress(hMsvcrt, "_strtod_l");
p__strnset_s = (void*)GetProcAddress(hMsvcrt, "_strnset_s");
p__wcsset_s = (void*)GetProcAddress(hMsvcrt, "_wcsset_s");
/* MSVCRT memcpy behaves like memmove for overlapping moves,
@@ -2848,6 +2911,7 @@ START_TEST(string)
@@ -2884,6 +2947,7 @@ START_TEST(string)
test__stricmp();
test__wcstoi64();
test_atoi();
@@ -137,5 +137,5 @@ index 1788035..5620c6d 100644
test_strxfrm();
test__strnset_s();
--
1.9.1
2.2.1