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

asfernandes · asfernandes · commit 4a890ea1b715 · 2022-04-23T21:44:00.000-03:00
diff --git a/src/common/CharSet.h b/src/common/CharSet.h
@@ -38,8 +38,11 @@ namespace Firebird {
 	template <>
 	inline void SimpleDelete<charset>::clear(charset* cs)
 	{
-		Firebird::IntlUtil::finiCharset(cs);
-		delete cs;
+		if (cs)
+		{
+			Firebird::IntlUtil::finiCharset(cs);
+			delete cs;
+		}
 	}
 
 }
diff --git a/src/intl/lc_icu.cpp b/src/intl/lc_icu.cpp
@@ -52,7 +52,7 @@ static bool texttype_default_init(texttype* tt,
 								  //const ASCII* configInfo)
 {
 	AutoPtr<charset> cs(FB_NEW charset);
-	memset(&cs, 0, sizeof(cs));
+	memset(cs, 0, sizeof(*cs));
 
 	// test if that ICU charset exist
 	if (!CSICU_charset_init(cs, charSetName))

Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,11 @@ namespace Firebird {`
`38`	`38`	`template <>`
`39`	`39`	`inline void SimpleDelete<charset>::clear(charset* cs)`
`40`	`40`	`{`
`41`		`- Firebird::IntlUtil::finiCharset(cs);`
`42`		`- delete cs;`
	`41`	`+ if (cs)`
	`42`	`+ {`
	`43`	`+ Firebird::IntlUtil::finiCharset(cs);`
	`44`	`+ delete cs;`
	`45`	`+ }`
`43`	`46`	`}`
`44`	`47`
`45`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ static bool texttype_default_init(texttype* tt,`
`52`	`52`	`//const ASCII* configInfo)`
`53`	`53`	`{`
`54`	`54`	`AutoPtr<charset> cs(FB_NEW charset);`
`55`		`- memset(&cs, 0, sizeof(cs));`
	`55`	`+ memset(cs, 0, sizeof(*cs));`
`56`	`56`
`57`	`57`	`// test if that ICU charset exist`
`58`	`58`	`if (!CSICU_charset_init(cs, charSetName))`