luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-24 11:12:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

keep entity name in a newly alocated buffer to prevent segfaulting on

Browse Source 
Wed Aug  7 17:38:16 2002  Tim Janik  <timj@gtk.org>

        * glib/gmarkup.c (unescape_text): keep entity name in
        a newly alocated buffer to prevent segfaulting on entity
        names which are longer than 5 characters.
This commit is contained in:
Tim Janik 2002-08-07 15:46:37 +00:00 committed by Tim Janik
parent 3631aa8283
commit 20dd22da42
8 changed files with 50 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Wed Aug 7 17:38:16 2002 Tim Janik <timj@gtk.org>
* glib/gmarkup.c (unescape_text): keep entity name in
a newly alocated buffer to prevent segfaulting on entity
names which are longer than 5 characters.
2002-08-06 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib/gmain.c: Factor out g_main_context_init_pipe from

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
Wed Aug 7 17:38:16 2002 Tim Janik <timj@gtk.org>
* glib/gmarkup.c (unescape_text): keep entity name in
a newly alocated buffer to prevent segfaulting on entity
names which are longer than 5 characters.
2002-08-06 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib/gmain.c: Factor out g_main_context_init_pipe from

6
ChangeLog.pre-2-12
View File

@ -1,3 +1,9 @@
Wed Aug 7 17:38:16 2002 Tim Janik <timj@gtk.org>
* glib/gmarkup.c (unescape_text): keep entity name in
a newly alocated buffer to prevent segfaulting on entity
names which are longer than 5 characters.
2002-08-06 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib/gmain.c: Factor out g_main_context_init_pipe from

6
ChangeLog.pre-2-2
View File

@ -1,3 +1,9 @@
Wed Aug 7 17:38:16 2002 Tim Janik <timj@gtk.org>
* glib/gmarkup.c (unescape_text): keep entity name in
a newly alocated buffer to prevent segfaulting on entity
names which are longer than 5 characters.
2002-08-06 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib/gmain.c: Factor out g_main_context_init_pipe from

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
Wed Aug 7 17:38:16 2002 Tim Janik <timj@gtk.org>
* glib/gmarkup.c (unescape_text): keep entity name in
a newly alocated buffer to prevent segfaulting on entity
names which are longer than 5 characters.
2002-08-06 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib/gmain.c: Factor out g_main_context_init_pipe from

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
Wed Aug 7 17:38:16 2002 Tim Janik <timj@gtk.org>
* glib/gmarkup.c (unescape_text): keep entity name in
a newly alocated buffer to prevent segfaulting on entity
names which are longer than 5 characters.
2002-08-06 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib/gmain.c: Factor out g_main_context_init_pipe from

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
Wed Aug 7 17:38:16 2002 Tim Janik <timj@gtk.org>
* glib/gmarkup.c (unescape_text): keep entity name in
a newly alocated buffer to prevent segfaulting on entity
names which are longer than 5 characters.
2002-08-06 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib/gmain.c: Factor out g_main_context_init_pipe from

32
glib/gmarkup.c
View File

@ -367,7 +367,6 @@ unescape_text (GMarkupParseContext *context,
gchar **unescaped,
GError **error)
{
#define MAX_ENT_LEN 5
GString *str;
const gchar *p;
UnescapeState state;
@ -450,11 +449,6 @@ unescape_text (GMarkupParseContext *context,
case USTATE_INSIDE_ENTITY_NAME:
{
gchar buf[MAX_ENT_LEN+1] = {
'\0', '\0', '\0', '\0', '\0', '\0'
};
gchar *dest;
while (p != text_end)
{
if (*p == ';')
@ -479,31 +473,22 @@ unescape_text (GMarkupParseContext *context,
{
if (p != text_end)
{
const gchar *src;
src = start;
dest = buf;
while (src != p)
{
*dest = *src;
++dest;
++src;
}
gchar *ent = g_strndup (start, p - start);
/* move to after semicolon */
p = g_utf8_next_char (p);
start = p;
state = USTATE_INSIDE_TEXT;
if (strcmp (buf, "lt") == 0)
if (strcmp (ent, "lt") == 0)
g_string_append_c (str, '<');
else if (strcmp (buf, "gt") == 0)
else if (strcmp (ent, "gt") == 0)
g_string_append_c (str, '>');
else if (strcmp (buf, "amp") == 0)
else if (strcmp (ent, "amp") == 0)
g_string_append_c (str, '&');
else if (strcmp (buf, "quot") == 0)
else if (strcmp (ent, "quot") == 0)
g_string_append_c (str, '"');
else if (strcmp (buf, "apos") == 0)
else if (strcmp (ent, "apos") == 0)
g_string_append_c (str, '\'');
else
{
@ -511,8 +496,9 @@ unescape_text (GMarkupParseContext *context,
p, text_end,
G_MARKUP_ERROR_PARSE,
_("Entity name '%s' is not known"),
buf);
ent);
}
g_free (ent);
}
else
{
@ -666,8 +652,6 @@ unescape_text (GMarkupParseContext *context,
*unescaped = g_string_free (str, FALSE);
return TRUE;
}
#undef MAX_ENT_LEN
}
static gboolean