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

Evas langauge: Prevent potential buffer overflow and clean code. 

We were copying a user defined string into a fixed size buffer
without doing any boundary checks. This commit fixes that.
Also cleaned up similar code that was using hardcoded numbers.

@fix.
This commit is contained in:
Tom Hacohen 2016-04-08 11:34:53 +01:00
parent f4f9753c20
commit 8203c79678
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/evas/common/language/evas_language_utils.c
View File

@ -145,8 +145,9 @@ evas_common_language_from_locale_get(void)
if (locale && *locale) if (locale && *locale)
{ {
char *itr; char *itr;
strncpy(lang, locale, 5); const size_t size = sizeof(lang);
lang[5] = '\0'; strncpy(lang, locale, size - 1);
lang[size - 1] = '\0';
itr = lang; itr = lang;
while (*itr) while (*itr)
{ {
@ -171,6 +172,7 @@ evas_common_language_from_locale_full_get(void)
locale = setlocale(LC_MESSAGES, NULL); locale = setlocale(LC_MESSAGES, NULL);
if (locale && *locale) if (locale && *locale)
{ {
const size_t size = sizeof(lang_full);
size_t i; size_t i;
for (i = 0 ; locale[i] ; i++) for (i = 0 ; locale[i] ; i++)
{ {
@ -178,6 +180,12 @@ evas_common_language_from_locale_full_get(void)
if ((c == '.') || (c == '@') || (c == ' ')) /* Looks like en_US.UTF8 or de_DE@euro or aa_ER UTF-8*/ if ((c == '.') || (c == '@') || (c == ' ')) /* Looks like en_US.UTF8 or de_DE@euro or aa_ER UTF-8*/
break; break;
} }
if (i >= size)
{
i = size - 1;
}
strncpy(lang_full, locale, i); strncpy(lang_full, locale, i);
lang_full[i] = '\0'; lang_full[i] = '\0';
return lang_full; return lang_full;