firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 17:23:03 +01:00
Code Issues

Postfix for #7169 - fix crashes caught by the tests.

Browse Source
This commit is contained in:
Adriano dos Santos Fernandes 2022-04-23 21:44:00 -03:00
parent 23f533e740
commit 4a890ea1b7
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/CharSet.h
View File

@ -38,8 +38,11 @@ namespace Firebird {
template <> template <>
inline void SimpleDelete<charset>::clear(charset* cs) inline void SimpleDelete<charset>::clear(charset* cs)
{ {
Firebird::IntlUtil::finiCharset(cs); if (cs)
delete cs; {
Firebird::IntlUtil::finiCharset(cs);
delete cs;
}
} }
} }

2
src/intl/lc_icu.cpp
View File

@ -52,7 +52,7 @@ static bool texttype_default_init(texttype* tt,
//const ASCII* configInfo) //const ASCII* configInfo)
{ {
AutoPtr<charset> cs(FB_NEW charset); AutoPtr<charset> cs(FB_NEW charset);
memset(&cs, 0, sizeof(cs)); memset(cs, 0, sizeof(*cs));
// test if that ICU charset exist // test if that ICU charset exist
if (!CSICU_charset_init(cs, charSetName)) if (!CSICU_charset_init(cs, charSetName))