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

NULL-terminate context->attr_values so g_strfreev() is safe. Would

Browse Source 
2002-01-28  Havoc Pennington  <hp@pobox.com>

	* glib/gmarkup.c (add_attribute): NULL-terminate
	context->attr_values so g_strfreev() is safe.
	Would previously crash if parsing was ended prior
	to ending the start tag.
	(g_markup_parse_context_parse): add a couple assertions
This commit is contained in:
Havoc Pennington 2002-01-29 03:42:23 +00:00 committed by Havoc Pennington
parent b8e36f4539
commit 3370260a13
9 changed files with 71 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2002-01-28 Havoc Pennington <hp@pobox.com>
* glib/gmarkup.c (add_attribute): NULL-terminate
context->attr_values so g_strfreev() is safe.
Would previously crash if parsing was ended prior
to ending the start tag.
(g_markup_parse_context_parse): add a couple assertions
2002-01-28 Havoc Pennington <hp@redhat.com> 2002-01-28 Havoc Pennington <hp@redhat.com>
* glib/gmacros.h: get rid of warning here * glib/gmacros.h: get rid of warning here

8
ChangeLog.pre-2-0
View File

@ -1,3 +1,11 @@
2002-01-28 Havoc Pennington <hp@pobox.com>
* glib/gmarkup.c (add_attribute): NULL-terminate
context->attr_values so g_strfreev() is safe.
Would previously crash if parsing was ended prior
to ending the start tag.
(g_markup_parse_context_parse): add a couple assertions
2002-01-28 Havoc Pennington <hp@redhat.com> 2002-01-28 Havoc Pennington <hp@redhat.com>
* glib/gmacros.h: get rid of warning here * glib/gmacros.h: get rid of warning here

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,11 @@
2002-01-28 Havoc Pennington <hp@pobox.com>
* glib/gmarkup.c (add_attribute): NULL-terminate
context->attr_values so g_strfreev() is safe.
Would previously crash if parsing was ended prior
to ending the start tag.
(g_markup_parse_context_parse): add a couple assertions
2002-01-28 Havoc Pennington <hp@redhat.com> 2002-01-28 Havoc Pennington <hp@redhat.com>
* glib/gmacros.h: get rid of warning here * glib/gmacros.h: get rid of warning here

8
ChangeLog.pre-2-12
View File

@ -1,3 +1,11 @@
2002-01-28 Havoc Pennington <hp@pobox.com>
* glib/gmarkup.c (add_attribute): NULL-terminate
context->attr_values so g_strfreev() is safe.
Would previously crash if parsing was ended prior
to ending the start tag.
(g_markup_parse_context_parse): add a couple assertions
2002-01-28 Havoc Pennington <hp@redhat.com> 2002-01-28 Havoc Pennington <hp@redhat.com>
* glib/gmacros.h: get rid of warning here * glib/gmacros.h: get rid of warning here

8
ChangeLog.pre-2-2
View File

@ -1,3 +1,11 @@
2002-01-28 Havoc Pennington <hp@pobox.com>
* glib/gmarkup.c (add_attribute): NULL-terminate
context->attr_values so g_strfreev() is safe.
Would previously crash if parsing was ended prior
to ending the start tag.
(g_markup_parse_context_parse): add a couple assertions
2002-01-28 Havoc Pennington <hp@redhat.com> 2002-01-28 Havoc Pennington <hp@redhat.com>
* glib/gmacros.h: get rid of warning here * glib/gmacros.h: get rid of warning here

8
ChangeLog.pre-2-4
View File

@ -1,3 +1,11 @@
2002-01-28 Havoc Pennington <hp@pobox.com>
* glib/gmarkup.c (add_attribute): NULL-terminate
context->attr_values so g_strfreev() is safe.
Would previously crash if parsing was ended prior
to ending the start tag.
(g_markup_parse_context_parse): add a couple assertions
2002-01-28 Havoc Pennington <hp@redhat.com> 2002-01-28 Havoc Pennington <hp@redhat.com>
* glib/gmacros.h: get rid of warning here * glib/gmacros.h: get rid of warning here

8
ChangeLog.pre-2-6
View File

@ -1,3 +1,11 @@
2002-01-28 Havoc Pennington <hp@pobox.com>
* glib/gmarkup.c (add_attribute): NULL-terminate
context->attr_values so g_strfreev() is safe.
Would previously crash if parsing was ended prior
to ending the start tag.
(g_markup_parse_context_parse): add a couple assertions
2002-01-28 Havoc Pennington <hp@redhat.com> 2002-01-28 Havoc Pennington <hp@redhat.com>
* glib/gmacros.h: get rid of warning here * glib/gmacros.h: get rid of warning here

8
ChangeLog.pre-2-8
View File

@ -1,3 +1,11 @@
2002-01-28 Havoc Pennington <hp@pobox.com>
* glib/gmarkup.c (add_attribute): NULL-terminate
context->attr_values so g_strfreev() is safe.
Would previously crash if parsing was ended prior
to ending the start tag.
(g_markup_parse_context_parse): add a couple assertions
2002-01-28 Havoc Pennington <hp@redhat.com> 2002-01-28 Havoc Pennington <hp@redhat.com>
* glib/gmacros.h: get rid of warning here * glib/gmacros.h: get rid of warning here

9
glib/gmarkup.c
View File

@ -732,6 +732,7 @@ add_attribute (GMarkupParseContext *context, char *name)
context->attr_names[context->cur_attr] = name; context->attr_names[context->cur_attr] = name;
context->attr_values[context->cur_attr] = NULL; context->attr_values[context->cur_attr] = NULL;
context->attr_names[context->cur_attr+1] = NULL; context->attr_names[context->cur_attr+1] = NULL;
context->attr_values[context->cur_attr+1] = NULL;
} }
/** /**
@ -1196,8 +1197,12 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
g_free (context->attr_values[pos]); g_free (context->attr_values[pos]);
context->attr_names[pos] = context->attr_values[pos] = NULL; context->attr_names[pos] = context->attr_values[pos] = NULL;
} }
context->cur_attr = -1; g_assert (context->cur_attr == -1);
g_assert (context->attr_names == NULL ||
context->attr_names[0] == NULL);
g_assert (context->attr_values == NULL ||
context->attr_values[0] == NULL);
if (tmp_error != NULL) if (tmp_error != NULL)
{ {
mark_error (context, tmp_error); mark_error (context, tmp_error);