mirror of https://github.com/MidnightCommander/mc
Fix crash when user menu is called in editor with no filename.
(mc_search): immediately return FALSE if str is NULL. (mc_search_run): immediately return FALSE if user_data is NULL. Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
parent
2eeb950439
commit
e574972d58
|
@ -238,7 +238,7 @@ mc_search_run (mc_search_t * lc_mc_search, const void *user_data,
|
||||||
{
|
{
|
||||||
gboolean ret = FALSE;
|
gboolean ret = FALSE;
|
||||||
|
|
||||||
if (!lc_mc_search)
|
if (lc_mc_search == NULL || user_data == NULL)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
if (!mc_search_is_type_avail (lc_mc_search->search_type))
|
if (!mc_search_is_type_avail (lc_mc_search->search_type))
|
||||||
{
|
{
|
||||||
|
@ -382,9 +382,15 @@ gboolean
|
||||||
mc_search (const gchar * pattern, const gchar * str, mc_search_type_t type)
|
mc_search (const gchar * pattern, const gchar * str, mc_search_type_t type)
|
||||||
{
|
{
|
||||||
gboolean ret;
|
gboolean ret;
|
||||||
mc_search_t *search = mc_search_new (pattern, -1);
|
mc_search_t *search;
|
||||||
|
|
||||||
|
if (str == NULL)
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
search = mc_search_new (pattern, -1);
|
||||||
if (search == NULL )
|
if (search == NULL )
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
search->search_type = type;
|
search->search_type = type;
|
||||||
search->is_case_sensitive = TRUE;
|
search->is_case_sensitive = TRUE;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue