mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-03 18:14:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

* syntax.c (read_one_line): Fixed SEGV when reading syntax file

Browse Source 
with "\r\n" line endings on Unix.
This commit is contained in:
Roland Illig 2004-10-16 13:33:21 +00:00
parent 10dbca29ab
commit 5d5237e557
2 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
edit/ChangeLog
View File

@ -1,3 +1,8 @@
2004-10-16 Roland Illig <roland.illig@gmx.de>
* syntax.c (read_one_line): Fixed SEGV when reading syntax file
with "\r\n" line endings on Unix.
2004-10-11 Leonard den Ottolander <leonard * den ottolander nl>
* editcmd.c (regexp_error): Small text fix.

38
edit/syntax.c
View File

@ -456,12 +456,12 @@ void edit_get_syntax_color (WEdit * edit, long byte_index, int *color)
/*
Returns 0 on error/eof or a count of the number of bytes read
including the newline. Result must be free'd.
In case of an error, *line will not be modified.
*/
static int read_one_line (char **line, FILE * f)
{
char *p;
int len = 256, c, r = 0, i = 0;
p = g_malloc0 (len);
GString *p = g_string_new ("");
int c, r = 0;
for (;;) {
c = fgetc (f);
@ -472,23 +472,27 @@ static int read_one_line (char **line, FILE * f)
r = 0;
}
break;
} else if (c == '\n') {
r = i + 1; /* extra 1 for the newline just read */
}
r++;
/* handle all of \r\n, \r, \n correctly. */
if (c == '\r') {
if ( (c = fgetc (f)) == '\n')
r++;
else
ungetc (c, f);
break;
}
if (c == '\n')
break;
g_string_append_c (p, c);
}
if (r != 0) {
*line = p->str;
g_string_free (p, FALSE);
} else {
if (i >= len - 1) {
char *q;
q = g_malloc0 (len * 2);
memcpy (q, p, len);
syntax_g_free (p);
p = q;
len *= 2;
g_string_free (p, TRUE);
}
p[i++] = c;
}
}
p[i] = 0;
*line = p;
return r;
}