enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 13 Pull Requests 2 Projects Releases Wiki Activity

epp: fix memory corruption when using #warning and #error 

The epp instructions #warning and #error would led to a segmentation
fault (invalid free) because the malloced buffer's base pointer was
moved.

@fix
This commit is contained in:
Jean Guyomarc'h 2016-10-05 12:00:38 +02:00
parent ed750f091a
commit 6687e8b0c0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bin/edje/epp/cpplib.c
View File

@ -3904,11 +3904,12 @@ do_error(cpp_reader * pfile, struct directive *keyword EINA_UNUSED,
{
int length = limit - buf;
unsigned char *copy = (unsigned char *)xmalloc(length + 1);
unsigned char *msg = copy;
memcpy(copy, buf, length);
copy[length] = 0;
SKIP_WHITE_SPACE(copy);
cpp_error(pfile, "#error %s", copy);
SKIP_WHITE_SPACE(msg);
cpp_error(pfile, "#error %s", msg);
free(copy);
return 0;
}
@ -3925,11 +3926,12 @@ do_warning(cpp_reader * pfile, struct directive *keyword EINA_UNUSED,
{
int length = limit - buf;
unsigned char *copy = (unsigned char *)xmalloc(length + 1);
unsigned char *msg = copy;
memcpy(copy, buf, length);
copy[length] = 0;
SKIP_WHITE_SPACE(copy);
cpp_warning(pfile, "#warning %s", copy);
SKIP_WHITE_SPACE(msg);
cpp_warning(pfile, "#warning %s", msg);
free(copy);
return 0;
}