IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Bug 797844 - Typing account number to select account fails

Browse Source 
Both the account separator and the input string might have regular
expression special characters that will screw up regex matching.
Escape both to ensure that matching works correctly.
This commit is contained in:
John Ralls 2020-07-19 12:00:48 -07:00
parent 8ef370ce87
commit 15b540370a
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnucash/register/register-gnome/combocell-gnome.c
View File

@ -530,9 +530,11 @@ gnc_combo_cell_type_ahead_search (const gchar* newval,
int num_found = 0; int num_found = 0;
gchar* match_str = NULL; gchar* match_str = NULL;
const char* sep = gnc_get_account_separator_string (); const char* sep = gnc_get_account_separator_string ();
gchar* newval_rep = g_strdup_printf (".*%s.*", sep); char* escaped_sep = g_regex_escape_string (sep, -1);
GRegex* regex0 = g_regex_new (sep, 0, 0, NULL); char* escaped_newval = g_regex_escape_string (newval, -1);
char* rep_str = g_regex_replace_literal (regex0, newval, -1, 0, gchar* newval_rep = g_strdup_printf (".*%s.*", escaped_sep);
GRegex* regex0 = g_regex_new (escaped_sep, 0, 0, NULL);
char* rep_str = g_regex_replace_literal (regex0, escaped_newval, -1, 0,
newval_rep, 0, NULL); newval_rep, 0, NULL);
GRegex *regex = g_regex_new (rep_str, G_REGEX_CASELESS, 0, NULL); GRegex *regex = g_regex_new (rep_str, G_REGEX_CASELESS, 0, NULL);
@ -546,6 +548,8 @@ gnc_combo_cell_type_ahead_search (const gchar* newval,
g_free (rep_str); g_free (rep_str);
g_free (newval_rep); g_free (newval_rep);
g_free (escaped_sep);
g_free (escaped_newval);
g_regex_unref (regex0); g_regex_unref (regex0);
block_list_signals (cell); //Prevent recursion from gtk_tree_view signals. block_list_signals (cell); //Prevent recursion from gtk_tree_view signals.