mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when user menu is called in editor with no filename.

Browse Source 
(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:
Andrew Borodin 2012-12-07 12:56:59 +04:00
parent 89f59bb12b
commit 3b6f3697f9
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/search/search.c
View File

@ -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 (search == NULL)
if (str == NULL)
return FALSE; return FALSE;
search = mc_search_new (pattern, -1);
if (search == NULL )
return FALSE;
search->search_type = type; search->search_type = type;
search->is_case_sensitive = TRUE; search->is_case_sensitive = TRUE;