forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 <[email protected]>
- Loading branch information
Showing
2 changed files
with
19 additions
and
0 deletions.
There are no files selected for viewing
18 changes: 18 additions & 0 deletions
18
...db/mysql-connector-c/files/mysql-connector-c-8.0.21-survive-malformed-charset-files.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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); | ||
} | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters