luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 07:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fail gracefully with an informative error message when recursion is

Browse Source 
2008-11-11  Owen Taylor  <otaylor@redhat.com>

        * girepository/giroffsets.c: Fail gracefully with an informative
        error message when recursion is encountered when computing a
        structure size.

svn path=/trunk/; revision=882
This commit is contained in:
Owen Taylor 2008-11-11 13:45:13 +00:00 committed by Owen Taylor
parent 01fda94550
commit 9d4aa3bba3
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
giroffsets.c
View File

@ -176,7 +176,7 @@ get_interface_size_alignment (GIrNodeType *type,
} }
} }
return *alignment != -1; return *alignment > 0;
} }
static gboolean static gboolean
@ -245,6 +245,8 @@ compute_struct_field_offsets (GList *members,
GList *l; GList *l;
gboolean have_error = FALSE; gboolean have_error = FALSE;
*alignment_out = -2; /* mark to detect recursion */
for (l = members; l; l = l->next) for (l = members; l; l = l->next)
{ {
GIrNode *member = (GIrNode *)l->data; GIrNode *member = (GIrNode *)l->data;
@ -310,6 +312,8 @@ compute_union_field_offsets (GList *members,
GList *l; GList *l;
gboolean have_error = FALSE; gboolean have_error = FALSE;
*alignment_out = -2; /* mark to detect recursion */
for (l = members; l; l = l->next) for (l = members; l; l = l->next)
{ {
GIrNode *member = (GIrNode *)l->data; GIrNode *member = (GIrNode *)l->data;
@ -353,6 +357,26 @@ compute_union_field_offsets (GList *members,
return !have_error; return !have_error;
} }
static gboolean
check_needs_computation (GIrNode *node,
GIrModule *module,
gint alignment)
{
/*
* 0: Not yet computed
* >0: Previously succeeded
* -1: Previously failed
* -2: In progress
*/
if (alignment == -2)
{
g_warning ("Recursion encountered when computing the size of %s.%s",
module->name, node->name);
}
return alignment == 0;
}
/** /**
* g_ir_node_compute_offsets: * g_ir_node_compute_offsets:
* @node: a #GIrNode * @node: a #GIrNode
@ -366,7 +390,7 @@ compute_union_field_offsets (GList *members,
void void
g_ir_node_compute_offsets (GIrNode *node, g_ir_node_compute_offsets (GIrNode *node,
GIrModule *module, GIrModule *module,
GList *modules) GList *modules)
{ {
switch (node->type) switch (node->type)
{ {
@ -374,7 +398,7 @@ g_ir_node_compute_offsets (GIrNode *node,
{ {
GIrNodeBoxed *boxed = (GIrNodeBoxed *)node; GIrNodeBoxed *boxed = (GIrNodeBoxed *)node;
if (boxed->alignment != 0) /* Already done */ if (!check_needs_computation (node, module, boxed->alignment))
return; return;
compute_struct_field_offsets (boxed->members, compute_struct_field_offsets (boxed->members,
@ -386,7 +410,7 @@ g_ir_node_compute_offsets (GIrNode *node,
{ {
GIrNodeStruct *struct_ = (GIrNodeStruct *)node; GIrNodeStruct *struct_ = (GIrNodeStruct *)node;
if (struct_->alignment != 0) if (!check_needs_computation (node, module, struct_->alignment))
return; return;
compute_struct_field_offsets (struct_->members, compute_struct_field_offsets (struct_->members,
@ -398,7 +422,7 @@ g_ir_node_compute_offsets (GIrNode *node,
{ {
GIrNodeUnion *union_ = (GIrNodeUnion *)node; GIrNodeUnion *union_ = (GIrNodeUnion *)node;
if (union_->alignment != 0) if (!check_needs_computation (node, module, union_->alignment))
return; return;
compute_union_field_offsets (union_->members, compute_union_field_offsets (union_->members,