mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-03-13 03:13:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed NULL acertion if replacement don't correct

Browse Source 
Also fixed multiple usage of replacement pointers (such as \1\1).

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
This commit is contained in:
Slava Zanko 2009-06-08 17:41:20 +03:00
parent 2e9a16487a
commit facb94dc48
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/file.c
View File

@ -152,8 +152,7 @@ transform_source (FileOpContext *ctx, const char *source)
{
char *s = g_strdup (source);
char *q;
char *ret;
GString *destination_mask;
GString *destination_mask, *temp_string;
const char *fnsource = x_basename (s);
char *fnsource_fixed = g_strdup (fnsource);
size_t j=0, len;
@ -175,10 +174,12 @@ transform_source (FileOpContext *ctx, const char *source)
g_free (fnsource_fixed);
destination_mask = g_string_new(ctx->dest_mask);
ret = g_string_free(mc_search_prepare_replace_str (ctx->search_handle, destination_mask), FALSE);
temp_string = mc_search_prepare_replace_str (ctx->search_handle, destination_mask);
g_string_free(destination_mask, TRUE);
g_free (s);
return ret;
if (temp_string == NULL)
return NULL;
return g_string_free(temp_string, FALSE);
}
static void

31
src/search/regex.c
View File

@ -197,14 +197,12 @@ mc_search__cond_struct_new_regex_ci_str (const char *charset, const char *str, g
continue;
}
if (tmp->str[loop] == '['
&& !mc_search_is_char_escaped (tmp->str, &(tmp->str[loop]) - 1)) {
if (tmp->str[loop] == '[' && !mc_search_is_char_escaped (tmp->str, &(tmp->str[loop]) - 1)) {
mc_search__cond_struct_new_regex_accum_append (charset, ret_str, accumulator);
while (loop < str_len && !(tmp->str[loop] == ']'
&& !mc_search_is_char_escaped (tmp->str,
&(tmp->str[loop]) -
1))) {
&(tmp->str[loop]) - 1))) {
g_string_append_c (ret_str, tmp->str[loop]);
loop++;
@ -300,33 +298,38 @@ mc_search__regex_found_cond (mc_search_t * mc_search, GString * search_str)
/* --------------------------------------------------------------------------------------------- */
static int
mc_search_regex__get_num_replace_tokens (const gchar * str, gsize len)
mc_search_regex__get_max_num_of_replace_tokens (const gchar * str, gsize len)
{
int count_tokens = 0;
int max_token = 0;
gsize loop;
for (loop = 0; loop < len - 1; loop++) {
if (str[loop] == '\\' && (str[loop + 1] & (char) 0xf0) == 0x30 /* 0-9 */ ) {
if (mc_search_is_char_escaped (str, &str[loop - 1]))
continue;
if (str[loop + 1] == '0')
continue;
count_tokens++;
if (max_token < str[loop + 1] - '0')
max_token = str[loop + 1] - '0';
continue;
}
if (str[loop] == '$' && str[loop + 1] == '{') {
gsize tmp_len;
char *tmp_str;
int tmp_token;
if (mc_search_is_char_escaped (str, &str[loop - 1]))
continue;
for (tmp_len = 0;
loop + tmp_len + 2 < len && (str[loop + 2 + tmp_len] & (char) 0xf0) == 0x30;
tmp_len++);
if (str[loop + 2 + tmp_len] == '}')
count_tokens++;
if (str[loop + 2 + tmp_len] == '}') {
tmp_str = g_strndup (loop + 2, tmp_len);
tmp_token = atoi (tmp_str);
if (max_token < tmp_token)
max_token = tmp_token;
g_free (tmp_str);
}
}
}
return count_tokens;
return max_token;
}
/* --------------------------------------------------------------------------------------------- */
@ -632,7 +635,7 @@ mc_search_regex_prepare_replace_str (mc_search_t * mc_search, GString * replace_
replace_transform_type_t replace_flags = REPLACE_T_NO_TRANSFORM;
num_replace_tokens =
mc_search_regex__get_num_replace_tokens (replace_str->str, replace_str->len);
mc_search_regex__get_max_num_of_replace_tokens (replace_str->str, replace_str->len);
if (mc_search->num_rezults < 0)
return g_string_new_len (replace_str->str, replace_str->len);