kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ecore imf - scim module - fix string handling to stop warnings 

so blind use of strncpy was again wrong - it limited to the length of
the src not the dest buffer and gcc warnings pointed out this
silliness. so instead go back to strcpy with proper length checks
before and now it's clear that it's correct and not trying to hide
behind strncpy which was wrong.
This commit is contained in:
Carsten Haitzler 2019-03-03 11:43:36 +00:00
parent f392c5a436
commit 58eceeef12
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/modules/ecore_imf/scim/scim_imcontext.cpp
View File

@ -358,7 +358,7 @@ find_ic(int id)
static void
feed_key_event(Evas *evas, const char *str, Eina_Bool fake)
{
char key_string[128] = {0};
char key_string[128] = { 0 };
unsigned int timestamp = 0;
if (!fake)
@ -366,15 +366,26 @@ feed_key_event(Evas *evas, const char *str, Eina_Bool fake)
if (strncmp(str, "KeyRelease+", 11) == 0)
{
strncpy(key_string, str + 11, strlen(str)-11);
evas_event_feed_key_up(evas, key_string, key_string, NULL, NULL, timestamp, NULL);
if ((strlen(str) - 11 + 1) > sizeof(key_string))
{
fprintf(stderr, "Key string too long: '%s'", str);
return;
}
strcpy(key_string, str + 11);
evas_event_feed_key_up(evas, key_string, key_string, NULL, NULL,
timestamp, NULL);
SCIM_DEBUG_FRONTEND(1) << " evas_event_feed_key_up()...\n";
}
else
{
if (strlen(str) + 1 > 128) return;
strncpy(key_string, str, strlen(str) + 1);
evas_event_feed_key_down(evas, key_string, key_string, NULL, NULL, timestamp, NULL);
if ((strlen(str) + 1) > sizeof(key_string))
{
fprintf(stderr, "Key string too long: '%s'", str);
return;
}
strcpy(key_string, str);
evas_event_feed_key_down(evas, key_string, key_string, NULL, NULL,
timestamp, NULL);
SCIM_DEBUG_FRONTEND(1) << " evas_event_feed_key_down()...\n";
}
}