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

Handle invalid characters.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Mooffie 2016-09-25 18:30:45 +03:00 committed by Andrew Borodin
parent cc8fcdcfc0
commit 64e6ccef7f
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/search/hex.c
View File

@ -42,7 +42,8 @@
typedef enum typedef enum
{ {
MC_SEARCH_HEX_E_OK, MC_SEARCH_HEX_E_OK,
MC_SEARCH_HEX_E_NUM_OUT_OF_RANGE MC_SEARCH_HEX_E_NUM_OUT_OF_RANGE,
MC_SEARCH_HEX_E_INVALID_CHARACTER
} mc_search_hex_parse_error_t; } mc_search_hex_parse_error_t;
/*** file scope type declarations ****************************************************************/ /*** file scope type declarations ****************************************************************/
@ -76,7 +77,6 @@ mc_search__hex_translate_to_regex (const GString * astr, mc_search_hex_parse_err
*tmp_str2++ = ' '; *tmp_str2++ = ' ';
} }
g_strchug (tmp_str); /* trim leadind whitespaces */
tmp_str_len = strlen (tmp_str); tmp_str_len = strlen (tmp_str);
while (loop < tmp_str_len && error == MC_SEARCH_HEX_E_OK) while (loop < tmp_str_len && error == MC_SEARCH_HEX_E_OK)
@ -84,8 +84,14 @@ mc_search__hex_translate_to_regex (const GString * astr, mc_search_hex_parse_err
unsigned int val; unsigned int val;
int ptr; int ptr;
if (g_ascii_isspace (tmp_str[loop]))
{
/* Eat-up whitespace between tokens. */
while (g_ascii_isspace (tmp_str[loop]))
loop++;
}
/* cppcheck-suppress invalidscanf */ /* cppcheck-suppress invalidscanf */
if (sscanf (tmp_str + loop, "%x%n", &val, &ptr) == 1) else if (sscanf (tmp_str + loop, "%x%n", &val, &ptr) == 1)
{ {
if (val > 255) if (val > 255)
error = MC_SEARCH_HEX_E_NUM_OUT_OF_RANGE; error = MC_SEARCH_HEX_E_NUM_OUT_OF_RANGE;
@ -112,7 +118,7 @@ mc_search__hex_translate_to_regex (const GString * astr, mc_search_hex_parse_err
loop += loop2; loop += loop2;
} }
else else
loop++; error = MC_SEARCH_HEX_E_INVALID_CHARACTER;
} }
g_free (tmp_str); g_free (tmp_str);
@ -159,6 +165,9 @@ mc_search__cond_struct_new_init_hex (const char *charset, mc_search_t * lc_mc_se
_ _
("Number out of range (should be in byte range, 0 <= n <= 0xFF, expressed in hex)"); ("Number out of range (should be in byte range, 0 <= n <= 0xFF, expressed in hex)");
break; break;
case MC_SEARCH_HEX_E_INVALID_CHARACTER:
desc = _("Invalid character");
break;
default: default:
desc = ""; desc = "";
} }

6
tests/lib/search/hex_translate_to_regex.c
View File

@ -79,6 +79,12 @@ static const struct test_hex_translate_to_regex_ds
NULL, NULL,
MC_SEARCH_HEX_E_NUM_OUT_OF_RANGE MC_SEARCH_HEX_E_NUM_OUT_OF_RANGE
}, },
{
/* Error: Invalid characters */
"1 z 2",
NULL,
MC_SEARCH_HEX_E_INVALID_CHARACTER
},
}; };
/* *INDENT-ON* */ /* *INDENT-ON* */