[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c/, dev-db/mysql-connector-c/files/

[Thomas Deutschmann]

commit:     381aa46351b1d3d78dd3af10dd0bdc6c844ff70a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 19 10:35:35 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 10:37:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=381aa463

dev-db/mysql-connector-c: survive malformed charset files

Bug: https://bugs.gentoo.org/737002
Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 ...ctor-c-8.0.21-survive-malformed-charset-files.patch | 18 ++++++++++++++++++
 ....0.21.ebuild => mysql-connector-c-8.0.21-r1.ebuild} |  1 +
 2 files changed, 19 insertions(+)

diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.21-survive-malformed-charset-files.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.21-survive-malformed-charset-files.patch
new file mode 100644
index 00000000000..72799f009c8
--- /dev/null
+++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.21-survive-malformed-charset-files.patch
@@ -0,0 +1,18 @@
+Description: don't crash on malformed charset files
+Origin: https://bugs.launchpad.net/ubuntu/+source/mysql-8.0/+bug/1877504/comments/19
+Bug: https://bugs.launchpad.net/ubuntu/+source/mysql-8.0/+bug/1884809
+Bug: https://bugs.gentoo.org/737002
+Forwarded: workaround, not needed
+
+--- a/mysys/charset.cc
++++ b/mysys/charset.cc
+@@ -922,7 +922,7 @@ size_t escape_quotes_for_mysql(CHARSET_I
+ 
+ void charset_uninit() {
+   for (CHARSET_INFO *cs : all_charsets) {
+-    if (cs && cs->coll->uninit) {
++    if (cs && cs->coll && cs->coll->uninit) {
+       cs->coll->uninit(cs);
+     }
+   }
+ 

diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.21.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.21-r1.ebuild
similarity index 97%
rename from dev-db/mysql-connector-c/mysql-connector-c-8.0.21.ebuild
rename to dev-db/mysql-connector-c/mysql-connector-c-8.0.21-r1.ebuild
index c6e4dad56ed..2cd9add1964 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.21.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.21-r1.ebuild
@@ -44,6 +44,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-8.0.18-always-build-decompress-utilities.patch
 	"${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch
 	"${FILESDIR}"/${PN}-8.0.21-libressl.patch
+	"${FILESDIR}"/${PN}-8.0.21-survive-malformed-charset-files.patch
 )
 
 src_prepare() {