Skip to content

W
wine-cw
Commit 00012d33 authored by Torge Matthies's avatar Torge Matthies Committed by Alexandre Julliard
Browse files
Options

msvcp90: Fix segfault in bad_alloc exception default constructor.

Signed-off-by: 's avatarTorge Matthies <tmatthies@codeweavers.com> Signed-off-by: 's avatarPiotr Caban <piotr@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent b31e671a
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
dlls/msvcp90/exception.c
View file @ 00012d33
......@@ -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));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment