Commit 078a9762 authored by Chad MILLER's avatar Chad MILLER

Merge bugteam and fix for 42675.

parents 5ac1f353 2443683f
...@@ -252,11 +252,16 @@ const char **my_error_unregister(int first, int last) ...@@ -252,11 +252,16 @@ const char **my_error_unregister(int first, int last)
void my_error_unregister_all(void) void my_error_unregister_all(void)
{ {
struct my_err_head *list, *next; struct my_err_head *cursor, *saved_next;
for (list= my_errmsgs_globerrs.meh_next; list; list= next)
for (cursor= my_errmsgs_globerrs.meh_next; cursor != NULL; cursor= saved_next)
{ {
next= list->meh_next; /* We need this ptr, but we're about to free its container, so save it. */
my_free((uchar*) list, MYF(0)); saved_next= cursor->meh_next;
my_free((uchar*) cursor, MYF(0));
} }
my_errmsgs_globerrs.meh_next= NULL; /* Freed in first iteration above. */
my_errmsgs_list= &my_errmsgs_globerrs; my_errmsgs_list= &my_errmsgs_globerrs;
} }
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