system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-22 19:44:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

msvcp90: Fix segfault in bad_alloc exception default constructor.

Browse source 
Signed-off-by: Torge Matthies <tmatthies@codeweavers.com>
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Torge Matthies 2022-06-07 10:30:07 +02:00 committed by Alexandre Julliard
parent b31e671a45
commit 00012d3381
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dlls/msvcp90/exception.c
View file

@ -36,7 +36,7 @@ int* __cdecl __processing_throw(void);
#if _MSVCP_VER >= 70 || defined(_MSVCIRT)
typedef const char **exception_name;
#define EXCEPTION_STR(name) (*name)
#define EXCEPTION_NAME(str) ((exception_name)&str)
#define EXCEPTION_NAME(str) (&str)
#else
typedef const char *exception_name;
#define EXCEPTION_STR(name) (name)
@ -96,7 +96,7 @@ exception* __thiscall exception_copy_ctor(exception *this, const exception *rhs)
this->name = rhs->name;
this->do_free = FALSE;
} else
MSVCP_exception_ctor(this, EXCEPTION_NAME(rhs->name));
MSVCP_exception_ctor(this, (exception_name)EXCEPTION_NAME(rhs->name));
TRACE("name = %s\n", this->name);
return this;
}
@ -214,7 +214,7 @@ bad_alloc* __thiscall MSVCP_bad_alloc_ctor(bad_alloc *this, exception_name name)
DEFINE_THISCALL_WRAPPER(MSVCP_bad_alloc_default_ctor, 4)
bad_alloc* __thiscall MSVCP_bad_alloc_default_ctor(bad_alloc *this)
{
static const char name[] = "bad allocation";
static const char *name = "bad allocation";
return MSVCP_bad_alloc_ctor(this, EXCEPTION_NAME(name));
}