mirror of
https://github.com/MariaDB/server.git
synced 2025-07-18 23:03:28 +03:00
charset.c:
Fixed: client crashed when there are no Index.xml file. mysys/charset.c: Fixed: client crashed when there are no Index.xml file.
This commit is contained in:
@ -540,7 +540,7 @@ static CHARSET_INFO *get_internal_charset(uint cs_number, myf flags)
|
|||||||
strxmov(get_charsets_dir(buf), cs->csname, ".xml", NullS);
|
strxmov(get_charsets_dir(buf), cs->csname, ".xml", NullS);
|
||||||
my_read_charset_file(buf,flags);
|
my_read_charset_file(buf,flags);
|
||||||
}
|
}
|
||||||
cs= (cs->state & MY_CS_AVAILABLE) ? cs : NULL;
|
cs= (cs && cs->state & MY_CS_AVAILABLE) ? cs : NULL;
|
||||||
pthread_mutex_unlock(&THR_LOCK_charset);
|
pthread_mutex_unlock(&THR_LOCK_charset);
|
||||||
return cs;
|
return cs;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user