enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

efreet segv maker removed. bad unescaping causing segvs! fixxored. 

SVN revision: 34445
This commit is contained in:
Carsten Haitzler 2008-05-03 09:25:43 +00:00
parent 0688234e2f
commit 9e6e6a86e2
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
legacy/efreet/src/lib/efreet_ini.c
View File

@ -69,28 +69,22 @@ static Ecore_Hash *
efreet_ini_parse(const char *file) efreet_ini_parse(const char *file)
{ {
FILE *f; FILE *f;
/* a static buffer for quick reading of lines that fit */ /* a static buffer for quick reading of lines that fit */
char static_buf[4096]; char static_buf[4096];
int static_buf_len = 4096;
/* a big buffer to allocate for lines that are larger than the static one */ /* a big buffer to allocate for lines that are larger than the static one */
char *big_buf = NULL; char *big_buf = NULL;
int big_buf_len = 0; int big_buf_len = 0;
int big_buf_step = static_buf_len; int big_buf_step = sizeof(static_buf);
/* the current location to read into (with fgets) and the amount to read */ /* the current location to read into (with fgets) and the amount to read */
char *read_buf; char *read_buf;
int read_len; int read_len;
/* the current buffer to parse */ /* the current buffer to parse */
char *buf; char *buf;
Ecore_Hash *data, *section = NULL; Ecore_Hash *data, *section = NULL;
/* start with the static buffer */ /* start with the static buffer */
buf = read_buf = static_buf; buf = read_buf = static_buf;
read_len = static_buf_len; read_len = sizeof(static_buf);
f = fopen(file, "rb"); f = fopen(file, "rb");
if (!f) return NULL; if (!f) return NULL;
@ -229,7 +223,7 @@ efreet_ini_parse(const char *file)
next_line: next_line:
/* finished parsing a line. use static buffer for next line */ /* finished parsing a line. use static buffer for next line */
buf = read_buf = static_buf; buf = read_buf = static_buf;
read_len = static_buf_len; read_len = sizeof(static_buf);
read_buf[read_len - 2] = '\n'; read_buf[read_len - 2] = '\n';
} }
@ -587,7 +581,7 @@ efreet_ini_unescape(const char *str)
dest = buf; dest = buf;
while(*p) while(*p)
{ {
if (*p == '\\') if ((*p == '\\') && (p[1] != '\0'))
{ {
p++; p++;
switch (*p) switch (*p)