2008-08-09 14:55:32 +02:00
|
|
|
/* GObject introspection: typelib validation, auxiliary functions
|
|
|
|
* related to the binary typelib format
|
2008-02-08 16:31:03 +01:00
|
|
|
*
|
|
|
|
* Copyright (C) 2005 Matthias Clasen
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
* License along with this library; if not, write to the
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
* Boston, MA 02111-1307, USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
#include <glib.h>
|
|
|
|
|
2008-06-08 16:37:30 +02:00
|
|
|
#include "gtypelib.h"
|
2008-02-08 16:31:03 +01:00
|
|
|
|
|
|
|
|
|
|
|
#define ALIGN_VALUE(this, boundary) \
|
|
|
|
(( ((unsigned long)(this)) + (((unsigned long)(boundary)) -1)) & (~(((unsigned long)(boundary))-1)))
|
|
|
|
|
|
|
|
|
|
|
|
DirEntry *
|
2008-08-09 14:55:32 +02:00
|
|
|
g_typelib_get_dir_entry (GTypelib *typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
guint16 index)
|
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
Header *header = (Header *)typelib->data;
|
2008-02-08 16:31:03 +01:00
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
return (DirEntry *)&typelib->data[header->directory + (index - 1) * header->entry_blob_size];
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2008-06-08 16:37:30 +02:00
|
|
|
g_typelib_check_sanity (void)
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
{
|
|
|
|
/* Check that struct layout is as we expect */
|
|
|
|
g_assert (sizeof (Header) == 100);
|
|
|
|
g_assert (sizeof (DirEntry) == 12);
|
|
|
|
g_assert (sizeof (SimpleTypeBlob) == 4);
|
|
|
|
g_assert (sizeof (ArgBlob) == 12);
|
|
|
|
g_assert (sizeof (SignatureBlob) == 8);
|
|
|
|
g_assert (sizeof (CommonBlob) == 8);
|
|
|
|
g_assert (sizeof (FunctionBlob) == 16);
|
|
|
|
g_assert (sizeof (InterfaceTypeBlob) == 4);
|
|
|
|
g_assert (sizeof (ArrayTypeBlob) == 8);
|
|
|
|
g_assert (sizeof (ParamTypeBlob) == 4);
|
|
|
|
g_assert (sizeof (ErrorTypeBlob) == 4);
|
|
|
|
g_assert (sizeof (ErrorDomainBlob) == 16);
|
|
|
|
g_assert (sizeof (ValueBlob) == 12);
|
|
|
|
g_assert (sizeof (FieldBlob) == 12);
|
|
|
|
g_assert (sizeof (RegisteredTypeBlob) == 16);
|
|
|
|
g_assert (sizeof (StructBlob) == 20);
|
|
|
|
g_assert (sizeof (EnumBlob) == 20);
|
|
|
|
g_assert (sizeof (PropertyBlob) == 12);
|
|
|
|
g_assert (sizeof (SignalBlob) == 12);
|
|
|
|
g_assert (sizeof (VFuncBlob) == 16);
|
|
|
|
g_assert (sizeof (ObjectBlob) == 32);
|
|
|
|
g_assert (sizeof (InterfaceBlob) == 28);
|
|
|
|
g_assert (sizeof (ConstantBlob) == 20);
|
|
|
|
g_assert (sizeof (AnnotationBlob) == 12);
|
|
|
|
g_assert (sizeof (UnionBlob) == 28);
|
2008-02-08 16:31:03 +01:00
|
|
|
}
|
|
|
|
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
|
2008-02-08 16:31:03 +01:00
|
|
|
static gboolean
|
|
|
|
is_aligned (guint32 offset)
|
|
|
|
{
|
|
|
|
return offset == ALIGN_VALUE (offset, 4);
|
|
|
|
}
|
|
|
|
|
|
|
|
#define MAX_NAME_LEN 200
|
|
|
|
|
|
|
|
static gboolean
|
2008-08-21 18:15:55 +02:00
|
|
|
validate_name (GTypelib *typelib,
|
|
|
|
const char *msg,
|
|
|
|
const guchar *data, guint32 offset,
|
|
|
|
GError **error)
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
gchar *name;
|
|
|
|
|
2008-08-21 18:15:55 +02:00
|
|
|
if (typelib->len < offset)
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID,
|
|
|
|
"The buffer is too short for type %s",
|
|
|
|
msg);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-02-08 16:31:03 +01:00
|
|
|
name = (gchar*)&data[offset];
|
|
|
|
|
2008-08-21 18:15:55 +02:00
|
|
|
if (!memchr (name, '\0', MAX_NAME_LEN))
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID,
|
|
|
|
"The %s is too long: %s",
|
|
|
|
msg, name);
|
|
|
|
return FALSE;
|
|
|
|
}
|
2008-02-08 16:31:03 +01:00
|
|
|
|
2008-08-21 18:15:55 +02:00
|
|
|
if (strspn (name, G_CSET_a_2_z G_CSET_A_2_Z G_CSET_DIGITS "-_") < strlen (name))
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID,
|
|
|
|
"The %s is contains invalid characters: %s",
|
|
|
|
msg, name);
|
|
|
|
return FALSE;
|
|
|
|
}
|
2008-02-08 16:31:03 +01:00
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2008-08-09 14:55:32 +02:00
|
|
|
validate_header (GTypelib *typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
GError **error)
|
|
|
|
{
|
|
|
|
Header *header;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (typelib->len < sizeof (Header))
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID,
|
2008-02-08 16:31:03 +01:00
|
|
|
"The buffer is too short");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
header = (Header *)typelib->data;
|
2008-02-08 16:31:03 +01:00
|
|
|
|
Merge in the gir-compiler branch. Thanks to Philip and Colin for their
2008-08-08 Johan Dahlin <johan@gnome.org>
* girepository/gtypelib.c (validate_header):
* girepository/gtypelib.h:
* giscanner/ast.py:
* giscanner/girwriter.py:
* giscanner/sourcescanner.c (gi_source_symbol_ref),
(gi_source_symbol_unref):
* tests/array.test:
* tests/boxed.test:
* tests/constant.test:
* tests/enum.test:
* tests/errors.test:
* tests/function.test:
* tests/gobject.test:
* tests/interface.test:
* tests/invoke/Makefile.am:
* tests/invoke/testfns.xml:
* tests/object.test:
* tests/parser/Makefile.am:
* tests/roundtrips.sh:
* tests/struct.test:
* tests/types.test:
* tests/union.test:
* tests/xref1.test:
* tests/xref2.test:
* tools/Makefile.am:
* tools/compiler.c (main):
* tools/generate.c (write_callable_info), (write_function_info),
(write_repository):
* tools/gidlmodule.c:
* tools/gidlmodule.h:
* tools/gidlnode.c:
* tools/gidlnode.h:
* tools/gidlparser.c:
* tools/gidlparser.h:
* tools/gidlwriter.c:
* tools/gidlwriter.h:
* tools/scanner.c (create_node_from_gtype),
(create_node_from_ctype), (g_igenerator_process_properties),
(g_igenerator_process_signals), (g_igenerator_create_object),
(g_igenerator_create_interface), (g_igenerator_create_boxed),
(g_igenerator_create_enum), (g_igenerator_create_flags),
(g_igenerator_process_function_symbol),
(g_igenerator_process_unregistered_struct_typedef),
(g_igenerator_process_struct_typedef),
(g_igenerator_process_union_typedef),
(g_igenerator_process_enum_typedef),
(g_igenerator_process_function_typedef),
(g_igenerator_process_constant), (g_igenerator_process_symbols),
(g_igenerator_add_module), (g_igenerator_add_include_idl):
Merge in the gir-compiler branch.
Thanks to Philip and Colin for their help.
svn path=/trunk/; revision=325
2008-08-08 21:09:17 +02:00
|
|
|
if (strncmp (header->magic, G_IR_MAGIC, 16) != 0)
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_HEADER,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Magic string not found");
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (header->major_version != 1 || header->minor_version != 0)
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_HEADER,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Version mismatch");
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (header->n_entries < header->n_local_entries)
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_HEADER,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Inconsistent entry counts");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (header->size != typelib->len)
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_HEADER,
|
2008-08-09 14:55:32 +02:00
|
|
|
"Typelib size mismatch");
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
if (header->entry_blob_size != 12 ||
|
|
|
|
header->function_blob_size != 16 ||
|
|
|
|
header->callback_blob_size != 12 ||
|
|
|
|
header->signal_blob_size != 12 ||
|
|
|
|
header->vfunc_blob_size != 16 ||
|
|
|
|
header->arg_blob_size != 12 ||
|
|
|
|
header->property_blob_size != 12 ||
|
|
|
|
header->field_blob_size != 12 ||
|
|
|
|
header->value_blob_size != 12 ||
|
|
|
|
header->constant_blob_size != 20 ||
|
|
|
|
header->error_domain_blob_size != 16 ||
|
|
|
|
header->annotation_blob_size != 12 ||
|
|
|
|
header->signature_blob_size != 8 ||
|
|
|
|
header->enum_blob_size != 20 ||
|
|
|
|
header->struct_blob_size != 20 ||
|
|
|
|
header->object_blob_size != 32 ||
|
|
|
|
header->interface_blob_size != 28 ||
|
|
|
|
header->union_blob_size != 28)
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_HEADER,
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
"Blob size mismatch");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-02-08 16:31:03 +01:00
|
|
|
if (!is_aligned (header->directory))
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_HEADER,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Misaligned directory");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!is_aligned (header->annotations))
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_HEADER,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Misaligned annotations");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (header->annotations == 0 && header->n_annotations > 0)
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_HEADER,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Wrong number of annotations");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-08-21 18:15:55 +02:00
|
|
|
if (!validate_name (typelib, "namespace", typelib->data, header->namespace, error))
|
|
|
|
return FALSE;
|
2008-02-08 16:31:03 +01:00
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
static gboolean validate_type_blob (GTypelib *typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
guint32 offset,
|
|
|
|
guint32 signature_offset,
|
|
|
|
gboolean return_type,
|
|
|
|
GError **error);
|
|
|
|
|
|
|
|
static gboolean
|
2008-08-09 14:55:32 +02:00
|
|
|
validate_array_type_blob (GTypelib *typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
guint32 offset,
|
|
|
|
guint32 signature_offset,
|
|
|
|
gboolean return_type,
|
|
|
|
GError **error)
|
|
|
|
{
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
ArrayTypeBlob *blob;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
blob = (ArrayTypeBlob*)&typelib->data[offset];
|
2008-02-08 16:31:03 +01:00
|
|
|
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
if (!blob->pointer)
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
"Pointer type exected for tag %d", blob->tag);
|
|
|
|
return FALSE;
|
2008-02-08 16:31:03 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* FIXME validate length */
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_type_blob (typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
offset + G_STRUCT_OFFSET (ArrayTypeBlob, type),
|
|
|
|
0, FALSE, error))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
static gboolean
|
2008-08-09 14:55:32 +02:00
|
|
|
validate_iface_type_blob (GTypelib *typelib,
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
guint32 offset,
|
|
|
|
guint32 signature_offset,
|
|
|
|
gboolean return_type,
|
|
|
|
GError **error)
|
|
|
|
{
|
|
|
|
InterfaceTypeBlob *blob;
|
|
|
|
Header *header;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
header = (Header *)typelib->data;
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
blob = (InterfaceTypeBlob*)&typelib->data[offset];
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
|
|
|
|
if (blob->interface == 0 || blob->interface > header->n_entries)
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
"Invalid directory index %d", blob->interface);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2008-02-08 16:31:03 +01:00
|
|
|
static gboolean
|
2008-08-09 14:55:32 +02:00
|
|
|
validate_param_type_blob (GTypelib *typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
guint32 offset,
|
|
|
|
guint32 signature_offset,
|
|
|
|
gboolean return_type,
|
|
|
|
gint n_params,
|
|
|
|
GError **error)
|
|
|
|
{
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
ParamTypeBlob *blob;
|
2008-02-08 16:31:03 +01:00
|
|
|
gint i;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
blob = (ParamTypeBlob*)&typelib->data[offset];
|
2008-02-08 16:31:03 +01:00
|
|
|
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
if (!blob->pointer)
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
"Pointer type exected for tag %d", blob->tag);
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (blob->n_types != n_params)
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Parameter type number mismatch");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < n_params; i++)
|
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_type_blob (typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
offset + sizeof (ParamTypeBlob) +
|
|
|
|
i * sizeof (SimpleTypeBlob),
|
|
|
|
0, FALSE, error))
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2008-08-09 14:55:32 +02:00
|
|
|
validate_error_type_blob (GTypelib *typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
guint32 offset,
|
|
|
|
guint32 signature_offset,
|
|
|
|
gboolean return_type,
|
|
|
|
GError **error)
|
|
|
|
{
|
|
|
|
ErrorTypeBlob *blob;
|
|
|
|
Header *header;
|
|
|
|
gint i;
|
|
|
|
DirEntry *entry;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
blob = (ErrorTypeBlob*)&typelib->data[offset];
|
2008-02-08 16:31:03 +01:00
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
header = (Header *)typelib->data;
|
2008-02-08 16:31:03 +01:00
|
|
|
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
if (!blob->pointer)
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
"Pointer type exected for tag %d", blob->tag);
|
|
|
|
return FALSE;
|
2008-02-08 16:31:03 +01:00
|
|
|
}
|
|
|
|
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
for (i = 0; i < blob->n_domains; i++)
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
if (blob->domains[i] == 0 || blob->domains[i] > header->n_entries)
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
"Invalid directory index %d", blob->domains[i]);
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
entry = g_typelib_get_dir_entry (typelib, blob->domains[i]);
|
2008-02-08 16:31:03 +01:00
|
|
|
|
|
|
|
if (entry->blob_type != BLOB_TYPE_ERROR_DOMAIN &&
|
|
|
|
(entry->local || entry->blob_type != BLOB_TYPE_INVALID))
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Wrong blob type");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2008-08-09 14:55:32 +02:00
|
|
|
validate_type_blob (GTypelib *typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
guint32 offset,
|
|
|
|
guint32 signature_offset,
|
|
|
|
gboolean return_type,
|
|
|
|
GError **error)
|
|
|
|
{
|
|
|
|
SimpleTypeBlob *simple;
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
InterfaceTypeBlob *iface;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
simple = (SimpleTypeBlob *)&typelib->data[offset];
|
2008-02-08 16:31:03 +01:00
|
|
|
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
if (simple->reserved == 0 &&
|
|
|
|
simple->reserved2 == 0)
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
2008-08-12 17:34:27 +02:00
|
|
|
if (simple->tag >= GI_TYPE_TAG_ARRAY)
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Wrong tag in simple type");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-08-12 17:34:27 +02:00
|
|
|
if (simple->tag >= GI_TYPE_TAG_UTF8 &&
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
!simple->pointer)
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
"Pointer type exected for tag %d", simple->tag);
|
|
|
|
return FALSE;
|
2008-02-08 16:31:03 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
iface = (InterfaceTypeBlob*)&typelib->data[simple->offset];
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
|
|
|
|
switch (iface->tag)
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
2008-08-12 17:34:27 +02:00
|
|
|
case GI_TYPE_TAG_ARRAY:
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_array_type_blob (typelib, simple->offset,
|
2008-02-08 16:31:03 +01:00
|
|
|
signature_offset, return_type, error))
|
|
|
|
return FALSE;
|
|
|
|
break;
|
2008-08-12 17:34:27 +02:00
|
|
|
case GI_TYPE_TAG_INTERFACE:
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_iface_type_blob (typelib, simple->offset,
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
signature_offset, return_type, error))
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
break;
|
2008-08-12 17:34:27 +02:00
|
|
|
case GI_TYPE_TAG_GLIST:
|
|
|
|
case GI_TYPE_TAG_GSLIST:
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_param_type_blob (typelib, simple->offset,
|
2008-02-08 16:31:03 +01:00
|
|
|
signature_offset, return_type, 1, error))
|
|
|
|
return FALSE;
|
|
|
|
break;
|
2008-08-12 17:34:27 +02:00
|
|
|
case GI_TYPE_TAG_GHASH:
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_param_type_blob (typelib, simple->offset,
|
2008-02-08 16:31:03 +01:00
|
|
|
signature_offset, return_type, 2, error))
|
|
|
|
return FALSE;
|
|
|
|
break;
|
2008-08-12 17:34:27 +02:00
|
|
|
case GI_TYPE_TAG_ERROR:
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_error_type_blob (typelib, simple->offset,
|
2008-02-08 16:31:03 +01:00
|
|
|
signature_offset, return_type, error))
|
|
|
|
return FALSE;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Wrong tag in complex type");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2008-08-09 14:55:32 +02:00
|
|
|
validate_arg_blob (GTypelib *typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
guint32 offset,
|
|
|
|
guint32 signature_offset,
|
|
|
|
GError **error)
|
|
|
|
{
|
|
|
|
ArgBlob *blob;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (typelib->len < offset + sizeof (ArgBlob))
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID,
|
2008-02-08 16:31:03 +01:00
|
|
|
"The buffer is too short");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
blob = (ArgBlob*) &typelib->data[offset];
|
2008-02-08 16:31:03 +01:00
|
|
|
|
2008-08-21 18:15:55 +02:00
|
|
|
if (!validate_name (typelib, "argument", typelib->data, blob->name, error))
|
|
|
|
return FALSE;
|
2008-02-08 16:31:03 +01:00
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_type_blob (typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
offset + G_STRUCT_OFFSET (ArgBlob, arg_type),
|
|
|
|
signature_offset, FALSE, error))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2008-08-09 14:55:32 +02:00
|
|
|
validate_signature_blob (GTypelib *typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
guint32 offset,
|
|
|
|
GError **error)
|
|
|
|
{
|
|
|
|
SignatureBlob *blob;
|
|
|
|
gint i;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (typelib->len < offset + sizeof (SignatureBlob))
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID,
|
2008-02-08 16:31:03 +01:00
|
|
|
"The buffer is too short");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
blob = (SignatureBlob*) &typelib->data[offset];
|
2008-02-08 16:31:03 +01:00
|
|
|
|
|
|
|
if (blob->return_type.offset != 0)
|
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_type_blob (typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
offset + G_STRUCT_OFFSET (SignatureBlob, return_type),
|
|
|
|
offset, TRUE, error))
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < blob->n_arguments; i++)
|
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_arg_blob (typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
offset + sizeof (SignatureBlob) +
|
|
|
|
i * sizeof (ArgBlob),
|
|
|
|
offset,
|
|
|
|
error))
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* FIXME check constraints on return_value */
|
|
|
|
/* FIXME check array-length pairs */
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2008-08-09 14:55:32 +02:00
|
|
|
validate_function_blob (GTypelib *typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
guint32 offset,
|
|
|
|
guint16 container_type,
|
|
|
|
GError **error)
|
|
|
|
{
|
|
|
|
FunctionBlob *blob;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (typelib->len < offset + sizeof (FunctionBlob))
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID,
|
2008-02-08 16:31:03 +01:00
|
|
|
"The buffer is too short");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
blob = (FunctionBlob*) &typelib->data[offset];
|
2008-02-08 16:31:03 +01:00
|
|
|
|
|
|
|
if (blob->blob_type != BLOB_TYPE_FUNCTION)
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Wrong blob type");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-08-21 18:15:55 +02:00
|
|
|
if (!validate_name (typelib, "function", typelib->data, blob->name, error))
|
|
|
|
return FALSE;
|
2008-02-08 16:31:03 +01:00
|
|
|
|
2008-08-21 18:15:55 +02:00
|
|
|
if (!validate_name (typelib, "function symbol", typelib->data, blob->symbol, error))
|
|
|
|
return FALSE;
|
2008-02-08 16:31:03 +01:00
|
|
|
|
|
|
|
if (blob->constructor)
|
|
|
|
{
|
|
|
|
switch (container_type)
|
|
|
|
{
|
|
|
|
case BLOB_TYPE_BOXED:
|
|
|
|
case BLOB_TYPE_OBJECT:
|
|
|
|
case BLOB_TYPE_INTERFACE:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Constructor not allowed");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (blob->setter || blob->getter || blob->wraps_vfunc)
|
|
|
|
{
|
|
|
|
switch (container_type)
|
|
|
|
{
|
|
|
|
case BLOB_TYPE_OBJECT:
|
|
|
|
case BLOB_TYPE_INTERFACE:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Setter, getter or wrapper not allowed");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (blob->index)
|
|
|
|
{
|
|
|
|
if (!(blob->setter || blob->getter || blob->wraps_vfunc))
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Must be setter, getter or wrapper");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* FIXME: validate index range */
|
|
|
|
/* FIXME: validate "this" argument for methods */
|
|
|
|
/* FIXME: validate return type for constructors */
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_signature_blob (typelib, blob->signature, error))
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2008-08-09 14:55:32 +02:00
|
|
|
validate_callback_blob (GTypelib *typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
guint32 offset,
|
|
|
|
GError **error)
|
|
|
|
{
|
|
|
|
CallbackBlob *blob;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (typelib->len < offset + sizeof (CallbackBlob))
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID,
|
2008-02-08 16:31:03 +01:00
|
|
|
"The buffer is too short");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
blob = (CallbackBlob*) &typelib->data[offset];
|
2008-02-08 16:31:03 +01:00
|
|
|
|
|
|
|
if (blob->blob_type != BLOB_TYPE_CALLBACK)
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Wrong blob type");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-08-21 18:15:55 +02:00
|
|
|
if (!validate_name (typelib, "callback", typelib->data, blob->name, error))
|
|
|
|
return FALSE;
|
2008-02-08 16:31:03 +01:00
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_signature_blob (typelib, blob->signature, error))
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2008-08-09 14:55:32 +02:00
|
|
|
validate_constant_blob (GTypelib *typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
guint32 offset,
|
|
|
|
GError **error)
|
|
|
|
{
|
|
|
|
gint value_size[] = {
|
|
|
|
0, 4, 1, 1, 2, 2, 4, 4, 8, 8,
|
|
|
|
sizeof (gint), sizeof (guint),
|
|
|
|
sizeof (glong), sizeof (gulong),
|
|
|
|
sizeof (gssize), sizeof (gsize),
|
|
|
|
sizeof (gfloat), sizeof (gdouble),
|
|
|
|
0, 0
|
|
|
|
};
|
|
|
|
ConstantBlob *blob;
|
|
|
|
SimpleTypeBlob *type;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (typelib->len < offset + sizeof (ConstantBlob))
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID,
|
2008-02-08 16:31:03 +01:00
|
|
|
"The buffer is too short");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
blob = (ConstantBlob*) &typelib->data[offset];
|
2008-02-08 16:31:03 +01:00
|
|
|
|
|
|
|
if (blob->blob_type != BLOB_TYPE_CONSTANT)
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Wrong blob type");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-08-21 18:15:55 +02:00
|
|
|
if (!validate_name (typelib, "constant", typelib->data, blob->name, error))
|
|
|
|
return FALSE;
|
2008-02-08 16:31:03 +01:00
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_type_blob (typelib, offset + G_STRUCT_OFFSET (ConstantBlob, type),
|
2008-02-08 16:31:03 +01:00
|
|
|
0, FALSE, error))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
if (!is_aligned (blob->offset))
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Misaligned constant value");
|
|
|
|
return FALSE;
|
|
|
|
}
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
type = (SimpleTypeBlob *)&typelib->data[offset + G_STRUCT_OFFSET (ConstantBlob, type)];
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
if (type->reserved == 0)
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
if (type->tag == 0)
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Constant value type void");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
if (value_size[type->tag] != 0 &&
|
|
|
|
blob->size != value_size[type->tag])
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Constant value size mismatch");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
/* FIXME check string values */
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2008-08-09 14:55:32 +02:00
|
|
|
validate_value_blob (GTypelib *typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
guint32 offset,
|
|
|
|
GError **error)
|
|
|
|
{
|
|
|
|
ValueBlob *blob;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (typelib->len < offset + sizeof (ValueBlob))
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID,
|
2008-02-08 16:31:03 +01:00
|
|
|
"The buffer is too short");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
blob = (ValueBlob*) &typelib->data[offset];
|
2008-02-08 16:31:03 +01:00
|
|
|
|
2008-08-21 18:15:55 +02:00
|
|
|
if (!validate_name (typelib, "value", typelib->data, blob->name, error))
|
|
|
|
return FALSE;
|
2008-02-08 16:31:03 +01:00
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2008-08-09 14:55:32 +02:00
|
|
|
validate_field_blob (GTypelib *typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
guint32 offset,
|
|
|
|
GError **error)
|
|
|
|
{
|
|
|
|
FieldBlob *blob;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (typelib->len < offset + sizeof (FieldBlob))
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID,
|
2008-02-08 16:31:03 +01:00
|
|
|
"The buffer is too short");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
blob = (FieldBlob*) &typelib->data[offset];
|
2008-02-08 16:31:03 +01:00
|
|
|
|
2008-08-21 18:15:55 +02:00
|
|
|
if (!validate_name (typelib, "field", typelib->data, blob->name, error))
|
|
|
|
return FALSE;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_type_blob (typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
offset + G_STRUCT_OFFSET (FieldBlob, type),
|
|
|
|
0, FALSE, error))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2008-08-09 14:55:32 +02:00
|
|
|
validate_property_blob (GTypelib *typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
guint32 offset,
|
|
|
|
GError **error)
|
|
|
|
{
|
|
|
|
PropertyBlob *blob;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (typelib->len < offset + sizeof (PropertyBlob))
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID,
|
2008-02-08 16:31:03 +01:00
|
|
|
"The buffer is too short");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
blob = (PropertyBlob*) &typelib->data[offset];
|
2008-02-08 16:31:03 +01:00
|
|
|
|
2008-08-21 18:15:55 +02:00
|
|
|
if (!validate_name (typelib, "property", typelib->data, blob->name, error))
|
|
|
|
return FALSE;
|
2008-02-08 16:31:03 +01:00
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_type_blob (typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
offset + G_STRUCT_OFFSET (PropertyBlob, type),
|
|
|
|
0, FALSE, error))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2008-08-09 14:55:32 +02:00
|
|
|
validate_signal_blob (GTypelib *typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
guint32 offset,
|
|
|
|
guint32 container_offset,
|
|
|
|
GError **error)
|
|
|
|
{
|
|
|
|
SignalBlob *blob;
|
|
|
|
gint n_signals;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (typelib->len < offset + sizeof (SignalBlob))
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID,
|
2008-02-08 16:31:03 +01:00
|
|
|
"The buffer is too short");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
blob = (SignalBlob*) &typelib->data[offset];
|
2008-02-08 16:31:03 +01:00
|
|
|
|
2008-08-21 18:15:55 +02:00
|
|
|
if (!validate_name (typelib, "signal", typelib->data, blob->name, error))
|
|
|
|
return FALSE;
|
2008-02-08 16:31:03 +01:00
|
|
|
|
|
|
|
if ((blob->run_first != 0) +
|
|
|
|
(blob->run_last != 0) +
|
|
|
|
(blob->run_cleanup != 0) != 1)
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Invalid signal run flags");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (blob->has_class_closure)
|
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
if (((CommonBlob*)&typelib->data[container_offset])->blob_type == BLOB_TYPE_OBJECT)
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
ObjectBlob *object;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
object = (ObjectBlob*)&typelib->data[container_offset];
|
2008-02-08 16:31:03 +01:00
|
|
|
|
|
|
|
n_signals = object->n_signals;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
InterfaceBlob *iface;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
iface = (InterfaceBlob*)&typelib->data[container_offset];
|
2008-02-08 16:31:03 +01:00
|
|
|
|
|
|
|
n_signals = iface->n_signals;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (blob->class_closure >= n_signals)
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Invalid class closure index");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_signature_blob (typelib, blob->signature, error))
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2008-08-09 14:55:32 +02:00
|
|
|
validate_vfunc_blob (GTypelib *typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
guint32 offset,
|
|
|
|
guint32 container_offset,
|
|
|
|
GError **error)
|
|
|
|
{
|
|
|
|
VFuncBlob *blob;
|
|
|
|
gint n_vfuncs;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (typelib->len < offset + sizeof (VFuncBlob))
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID,
|
2008-02-08 16:31:03 +01:00
|
|
|
"The buffer is too short");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
blob = (VFuncBlob*) &typelib->data[offset];
|
2008-02-08 16:31:03 +01:00
|
|
|
|
2008-08-21 18:15:55 +02:00
|
|
|
if (!validate_name (typelib, "vfunc", typelib->data, blob->name, error))
|
|
|
|
return FALSE;
|
2008-02-08 16:31:03 +01:00
|
|
|
|
|
|
|
if (blob->class_closure)
|
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
if (((CommonBlob*)&typelib->data[container_offset])->blob_type == BLOB_TYPE_OBJECT)
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
ObjectBlob *object;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
object = (ObjectBlob*)&typelib->data[container_offset];
|
2008-02-08 16:31:03 +01:00
|
|
|
|
|
|
|
n_vfuncs = object->n_vfuncs;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
InterfaceBlob *iface;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
iface = (InterfaceBlob*)&typelib->data[container_offset];
|
2008-02-08 16:31:03 +01:00
|
|
|
|
|
|
|
n_vfuncs = iface->n_vfuncs;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (blob->class_closure >= n_vfuncs)
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Invalid class closure index");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_signature_blob (typelib, blob->signature, error))
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2008-08-09 14:55:32 +02:00
|
|
|
validate_struct_blob (GTypelib *typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
guint32 offset,
|
|
|
|
guint16 blob_type,
|
|
|
|
GError **error)
|
|
|
|
{
|
|
|
|
StructBlob *blob;
|
|
|
|
gint i;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (typelib->len < offset + sizeof (StructBlob))
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID,
|
2008-02-08 16:31:03 +01:00
|
|
|
"The buffer is too short");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
blob = (StructBlob*) &typelib->data[offset];
|
2008-02-08 16:31:03 +01:00
|
|
|
|
|
|
|
if (blob->blob_type != blob_type)
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Wrong blob type");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((blob->blob_type == BLOB_TYPE_BOXED && blob->unregistered) ||
|
|
|
|
(blob->blob_type == BLOB_TYPE_STRUCT && !blob->unregistered))
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Registration/blob type mismatch");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-08-21 18:15:55 +02:00
|
|
|
if (!validate_name (typelib, "struct", typelib->data, blob->name, error))
|
|
|
|
return FALSE;
|
2008-02-08 16:31:03 +01:00
|
|
|
|
|
|
|
if (blob_type == BLOB_TYPE_BOXED)
|
|
|
|
{
|
2008-08-21 18:15:55 +02:00
|
|
|
if (!validate_name (typelib, "boxed", typelib->data, blob->gtype_name, error))
|
|
|
|
return FALSE;
|
2008-02-08 16:31:03 +01:00
|
|
|
|
2008-08-21 18:15:55 +02:00
|
|
|
if (!validate_name (typelib, "boxed", typelib->data, blob->gtype_init, error))
|
|
|
|
return FALSE;
|
2008-02-08 16:31:03 +01:00
|
|
|
}
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
else
|
|
|
|
{
|
|
|
|
if (blob->gtype_name || blob->gtype_init)
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
"Gtype data in struct");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
2008-02-08 16:31:03 +01:00
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (typelib->len < offset + sizeof (StructBlob) +
|
2008-02-08 16:31:03 +01:00
|
|
|
blob->n_fields * sizeof (FieldBlob) +
|
|
|
|
blob->n_methods * sizeof (FunctionBlob))
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID,
|
2008-02-08 16:31:03 +01:00
|
|
|
"The buffer is too short");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < blob->n_fields; i++)
|
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_field_blob (typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
offset + sizeof (StructBlob) +
|
|
|
|
i * sizeof (FieldBlob),
|
|
|
|
error))
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < blob->n_methods; i++)
|
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_function_blob (typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
offset + sizeof (StructBlob) +
|
|
|
|
blob->n_fields * sizeof (FieldBlob) +
|
|
|
|
i * sizeof (FunctionBlob),
|
|
|
|
blob_type,
|
|
|
|
error))
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2008-08-09 14:55:32 +02:00
|
|
|
validate_enum_blob (GTypelib *typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
guint32 offset,
|
|
|
|
guint16 blob_type,
|
|
|
|
GError **error)
|
|
|
|
{
|
|
|
|
EnumBlob *blob;
|
|
|
|
ValueBlob *v1, *v2;
|
|
|
|
gint i, j;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (typelib->len < offset + sizeof (EnumBlob))
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID,
|
2008-02-08 16:31:03 +01:00
|
|
|
"The buffer is too short");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
blob = (EnumBlob*) &typelib->data[offset];
|
2008-02-08 16:31:03 +01:00
|
|
|
|
|
|
|
if (blob->blob_type != blob_type)
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Wrong blob type");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!blob->unregistered)
|
|
|
|
{
|
2008-08-21 18:15:55 +02:00
|
|
|
if (!validate_name (typelib, "enum", typelib->data, blob->gtype_name, error))
|
|
|
|
return FALSE;
|
2008-02-08 16:31:03 +01:00
|
|
|
|
2008-08-21 18:15:55 +02:00
|
|
|
if (!validate_name (typelib, "enum", typelib->data, blob->gtype_init, error))
|
|
|
|
return FALSE;
|
2008-02-08 16:31:03 +01:00
|
|
|
}
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
else
|
|
|
|
{
|
|
|
|
if (blob->gtype_name || blob->gtype_init)
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
Revert revisions 157,149-148,136-129 and 120. Move back to using
2008-04-22 Johan Dahlin <johan@gnome.org>
* girepository/ginfo.c (g_info_from_entry), (g_type_info_new),
(g_type_info_is_pointer), (g_type_info_get_tag),
(g_type_info_get_param_type), (g_type_info_get_interface),
(g_type_info_get_array_length), (g_type_info_is_zero_terminated),
(g_type_info_get_n_error_domains), (g_type_info_get_error_domain),
(g_error_domain_info_get_codes), (g_enum_info_get_value),
(g_object_info_get_interface), (g_object_info_get_field),
(g_interface_info_get_prerequisite),
(g_signal_info_get_class_closure), (g_constant_info_get_value):
* girepository/ginvoke.c (get_ffi_type):
* girepository/girepository.h:
* girepository/gmetadata.c (g_metadata_get_dir_entry),
(g_metadata_check_sanity), (validate_header),
(validate_array_type_blob), (validate_iface_type_blob),
(validate_param_type_blob), (validate_error_type_blob),
(validate_type_blob), (validate_constant_blob),
(validate_struct_blob), (validate_enum_blob):
* girepository/gmetadata.h:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/invoke/invoke.c (main):
* tests/roundtrips.sh:
* tools/Makefile.am:
* tools/compiler.c (format_output), (write_out_metadata), (main):
* tools/generate.c (write_type_name), (write_type_info),
(write_constant_value), (write_enum_info), (load_metadata), (main):
* tools/gidlcompilercontext.c:
* tools/gidlcompilercontext.h:
* tools/gidlcompilerentrynode.c:
* tools/gidlcompilerentrynode.h:
* tools/gidlcompilertypenode.c:
* tools/gidlcompilertypenode.h:
* tools/gidlmodule.c (g_idl_module_build_metadata):
* tools/gidlmodule.h:
* tools/gidlnode.c (init_stats), (dump_stats),
(g_idl_node_get_size), (g_idl_node_get_full_size),
(g_idl_node_cmp), (g_idl_node_can_have_member),
(g_idl_node_add_member), (g_idl_node_param_direction_string),
(parse_int_value), (parse_uint_value), (parse_float_value),
(parse_boolean_value), (find_entry_node), (find_entry),
(serialize_type), (g_idl_node_build_metadata), (write_string):
* tools/gidlnode.h:
* tools/gidlparser.c (parse_type_internal):
* tools/quote-file.sh:
Revert revisions 157,149-148,136-129 and 120.
Move back to using g-idl-generate to generate the metadata and
avoids dependency on a c compiler.
svn path=/trunk/; revision=214
2008-04-23 00:48:16 +02:00
|
|
|
"Gtype data in unregistered enum");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
2008-02-08 16:31:03 +01:00
|
|
|
|
2008-08-21 18:15:55 +02:00
|
|
|
if (!validate_name (typelib, "enum", typelib->data, blob->name, error))
|
|
|
|
return FALSE;
|
2008-02-08 16:31:03 +01:00
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (typelib->len < offset + sizeof (EnumBlob) +
|
2008-02-08 16:31:03 +01:00
|
|
|
blob->n_values * sizeof (ValueBlob))
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID,
|
2008-02-08 16:31:03 +01:00
|
|
|
"The buffer is too short");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < blob->n_values; i++)
|
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_value_blob (typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
offset + sizeof (EnumBlob) +
|
|
|
|
i * sizeof (ValueBlob),
|
|
|
|
error))
|
|
|
|
return FALSE;
|
|
|
|
|
2008-08-17 00:26:55 +02:00
|
|
|
#if 0
|
2008-08-09 14:55:32 +02:00
|
|
|
v1 = (ValueBlob *)&typelib->data[offset + sizeof (EnumBlob) +
|
2008-02-08 16:31:03 +01:00
|
|
|
i * sizeof (ValueBlob)];
|
|
|
|
for (j = 0; j < i; j++)
|
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
v2 = (ValueBlob *)&typelib->data[offset + sizeof (EnumBlob) +
|
2008-02-08 16:31:03 +01:00
|
|
|
j * sizeof (ValueBlob)];
|
|
|
|
|
|
|
|
if (v1->value == v2->value)
|
|
|
|
{
|
2008-08-17 00:26:55 +02:00
|
|
|
|
2008-02-08 16:31:03 +01:00
|
|
|
/* FIXME should this be an error ? */
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Duplicate enum value");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
2008-08-17 00:26:55 +02:00
|
|
|
#endif
|
2008-02-08 16:31:03 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2008-08-09 14:55:32 +02:00
|
|
|
validate_object_blob (GTypelib *typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
guint32 offset,
|
|
|
|
GError **error)
|
|
|
|
{
|
|
|
|
Header *header;
|
|
|
|
ObjectBlob *blob;
|
|
|
|
gint i;
|
|
|
|
guint32 offset2;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
header = (Header *)typelib->data;
|
2008-02-08 16:31:03 +01:00
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (typelib->len < offset + sizeof (ObjectBlob))
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID,
|
2008-02-08 16:31:03 +01:00
|
|
|
"The buffer is too short");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
blob = (ObjectBlob*) &typelib->data[offset];
|
2008-02-08 16:31:03 +01:00
|
|
|
|
|
|
|
if (blob->blob_type != BLOB_TYPE_OBJECT)
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Wrong blob type");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-08-21 18:15:55 +02:00
|
|
|
if (!validate_name (typelib, "object", typelib->data, blob->gtype_name, error))
|
|
|
|
return FALSE;
|
2008-02-08 16:31:03 +01:00
|
|
|
|
2008-08-21 18:15:55 +02:00
|
|
|
if (!validate_name (typelib, "object", typelib->data, blob->gtype_init, error))
|
|
|
|
return FALSE;
|
2008-02-08 16:31:03 +01:00
|
|
|
|
2008-08-21 18:15:55 +02:00
|
|
|
if (!validate_name (typelib, "object", typelib->data, blob->name, error))
|
|
|
|
return FALSE;
|
2008-02-08 16:31:03 +01:00
|
|
|
|
|
|
|
if (blob->parent > header->n_entries)
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Invalid parent index");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (blob->parent != 0)
|
|
|
|
{
|
|
|
|
DirEntry *entry;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
entry = g_typelib_get_dir_entry (typelib, blob->parent);
|
2008-02-08 16:31:03 +01:00
|
|
|
if (entry->blob_type != BLOB_TYPE_OBJECT &&
|
|
|
|
(entry->local || entry->blob_type != 0))
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Parent not object");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (typelib->len < offset + sizeof (ObjectBlob) +
|
2008-02-08 16:31:03 +01:00
|
|
|
(blob->n_interfaces + blob->n_interfaces % 2) * 2 +
|
|
|
|
blob->n_fields * sizeof (FieldBlob) +
|
|
|
|
blob->n_properties * sizeof (PropertyBlob) +
|
|
|
|
blob->n_methods * sizeof (FunctionBlob) +
|
|
|
|
blob->n_signals * sizeof (SignalBlob) +
|
|
|
|
blob->n_vfuncs * sizeof (VFuncBlob) +
|
|
|
|
blob->n_constants * sizeof (ConstantBlob))
|
|
|
|
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID,
|
2008-02-08 16:31:03 +01:00
|
|
|
"The buffer is too short");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
offset2 = offset + sizeof (ObjectBlob);
|
|
|
|
|
|
|
|
for (i = 0; i < blob->n_interfaces; i++, offset2 += 2)
|
|
|
|
{
|
|
|
|
guint16 iface;
|
|
|
|
DirEntry *entry;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
iface = *(guint16*)&typelib->data[offset2];
|
2008-02-08 16:31:03 +01:00
|
|
|
if (iface == 0 || iface > header->n_entries)
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Invalid interface index");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
entry = g_typelib_get_dir_entry (typelib, iface);
|
2008-02-08 16:31:03 +01:00
|
|
|
|
|
|
|
if (entry->blob_type != BLOB_TYPE_INTERFACE &&
|
|
|
|
(entry->local || entry->blob_type != 0))
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Not an interface");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
offset2 += 2 * (blob->n_interfaces %2);
|
|
|
|
|
|
|
|
for (i = 0; i < blob->n_fields; i++, offset2 += sizeof (FieldBlob))
|
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_field_blob (typelib, offset2, error))
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < blob->n_properties; i++, offset2 += sizeof (PropertyBlob))
|
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_property_blob (typelib, offset2, error))
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < blob->n_methods; i++, offset2 += sizeof (FunctionBlob))
|
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_function_blob (typelib, offset2, BLOB_TYPE_OBJECT, error))
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < blob->n_signals; i++, offset2 += sizeof (SignalBlob))
|
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_signal_blob (typelib, offset2, offset, error))
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < blob->n_vfuncs; i++, offset2 += sizeof (VFuncBlob))
|
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_vfunc_blob (typelib, offset2, offset, error))
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < blob->n_constants; i++, offset2 += sizeof (ConstantBlob))
|
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_constant_blob (typelib, offset2, error))
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2008-08-09 14:55:32 +02:00
|
|
|
validate_interface_blob (GTypelib *typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
guint32 offset,
|
|
|
|
GError **error)
|
|
|
|
{
|
|
|
|
Header *header;
|
|
|
|
InterfaceBlob *blob;
|
|
|
|
gint i;
|
|
|
|
guint32 offset2;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
header = (Header *)typelib->data;
|
2008-02-08 16:31:03 +01:00
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (typelib->len < offset + sizeof (InterfaceBlob))
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID,
|
2008-02-08 16:31:03 +01:00
|
|
|
"The buffer is too short");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
blob = (InterfaceBlob*) &typelib->data[offset];
|
2008-02-08 16:31:03 +01:00
|
|
|
|
|
|
|
if (blob->blob_type != BLOB_TYPE_INTERFACE)
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Wrong blob type");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-08-21 18:15:55 +02:00
|
|
|
if (!validate_name (typelib, "interface", typelib->data, blob->gtype_name, error))
|
|
|
|
return FALSE;
|
2008-02-08 16:31:03 +01:00
|
|
|
|
2008-08-21 18:15:55 +02:00
|
|
|
if (!validate_name (typelib, "interface", typelib->data, blob->gtype_init, error))
|
|
|
|
return FALSE;
|
2008-02-08 16:31:03 +01:00
|
|
|
|
2008-08-21 18:15:55 +02:00
|
|
|
if (!validate_name (typelib, "interface", typelib->data, blob->name, error))
|
|
|
|
return FALSE;
|
2008-02-08 16:31:03 +01:00
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (typelib->len < offset + sizeof (InterfaceBlob) +
|
2008-02-08 16:31:03 +01:00
|
|
|
(blob->n_prerequisites + blob->n_prerequisites % 2) * 2 +
|
|
|
|
blob->n_properties * sizeof (PropertyBlob) +
|
|
|
|
blob->n_methods * sizeof (FunctionBlob) +
|
|
|
|
blob->n_signals * sizeof (SignalBlob) +
|
|
|
|
blob->n_vfuncs * sizeof (VFuncBlob) +
|
|
|
|
blob->n_constants * sizeof (ConstantBlob))
|
|
|
|
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID,
|
2008-02-08 16:31:03 +01:00
|
|
|
"The buffer is too short");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
offset2 = offset + sizeof (InterfaceBlob);
|
|
|
|
|
|
|
|
for (i = 0; i < blob->n_prerequisites; i++, offset2 += 2)
|
|
|
|
{
|
|
|
|
DirEntry *entry;
|
|
|
|
guint16 req;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
req = *(guint16*)&typelib->data[offset2];
|
2008-02-08 16:31:03 +01:00
|
|
|
if (req == 0 || req > header->n_entries)
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Invalid prerequisite index");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
entry = g_typelib_get_dir_entry (typelib, req);
|
2008-02-08 16:31:03 +01:00
|
|
|
if (entry->blob_type != BLOB_TYPE_INTERFACE &&
|
|
|
|
entry->blob_type != BLOB_TYPE_OBJECT &&
|
|
|
|
(entry->local || entry->blob_type != 0))
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_BLOB,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Not an interface or object");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
offset2 += 2 * (blob->n_prerequisites % 2);
|
|
|
|
|
|
|
|
for (i = 0; i < blob->n_properties; i++, offset2 += sizeof (PropertyBlob))
|
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_property_blob (typelib, offset2, error))
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < blob->n_methods; i++, offset2 += sizeof (FunctionBlob))
|
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_function_blob (typelib, offset2, BLOB_TYPE_INTERFACE, error))
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < blob->n_signals; i++, offset2 += sizeof (SignalBlob))
|
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_signal_blob (typelib, offset2, offset, error))
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < blob->n_vfuncs; i++, offset2 += sizeof (VFuncBlob))
|
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_vfunc_blob (typelib, offset2, offset, error))
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < blob->n_constants; i++, offset2 += sizeof (ConstantBlob))
|
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_constant_blob (typelib, offset2, error))
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2008-08-09 14:55:32 +02:00
|
|
|
validate_errordomain_blob (GTypelib *typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
guint32 offset,
|
|
|
|
GError **error)
|
|
|
|
{
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2008-08-09 14:55:32 +02:00
|
|
|
validate_union_blob (GTypelib *typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
guint32 offset,
|
|
|
|
GError **error)
|
|
|
|
{
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2008-08-09 14:55:32 +02:00
|
|
|
validate_blob (GTypelib *typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
guint32 offset,
|
|
|
|
GError **error)
|
|
|
|
{
|
|
|
|
CommonBlob *common;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (typelib->len < offset + sizeof (CommonBlob))
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID,
|
2008-02-08 16:31:03 +01:00
|
|
|
"The buffer is too short");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
common = (CommonBlob*)&typelib->data[offset];
|
2008-02-08 16:31:03 +01:00
|
|
|
|
|
|
|
switch (common->blob_type)
|
|
|
|
{
|
|
|
|
case BLOB_TYPE_FUNCTION:
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_function_blob (typelib, offset, 0, error))
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
break;
|
|
|
|
case BLOB_TYPE_CALLBACK:
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_callback_blob (typelib, offset, error))
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
break;
|
|
|
|
case BLOB_TYPE_STRUCT:
|
|
|
|
case BLOB_TYPE_BOXED:
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_struct_blob (typelib, offset, common->blob_type, error))
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
break;
|
|
|
|
case BLOB_TYPE_ENUM:
|
|
|
|
case BLOB_TYPE_FLAGS:
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_enum_blob (typelib, offset, common->blob_type, error))
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
break;
|
|
|
|
case BLOB_TYPE_OBJECT:
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_object_blob (typelib, offset, error))
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
break;
|
|
|
|
case BLOB_TYPE_INTERFACE:
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_interface_blob (typelib, offset, error))
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
break;
|
|
|
|
case BLOB_TYPE_CONSTANT:
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_constant_blob (typelib, offset, error))
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
break;
|
|
|
|
case BLOB_TYPE_ERROR_DOMAIN:
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_errordomain_blob (typelib, offset, error))
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
break;
|
|
|
|
case BLOB_TYPE_UNION:
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_union_blob (typelib, offset, error))
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_ENTRY,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Invalid blob type");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2008-08-09 14:55:32 +02:00
|
|
|
validate_directory (GTypelib *typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
GError **error)
|
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
Header *header = (Header *)typelib->data;
|
2008-02-08 16:31:03 +01:00
|
|
|
DirEntry *entry;
|
|
|
|
gint i;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (typelib->len < header->directory + header->n_entries * sizeof (DirEntry))
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID,
|
2008-02-08 16:31:03 +01:00
|
|
|
"The buffer is too short");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < header->n_entries; i++)
|
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
entry = g_typelib_get_dir_entry (typelib, i + 1);
|
2008-02-08 16:31:03 +01:00
|
|
|
|
2008-08-21 18:15:55 +02:00
|
|
|
if (!validate_name (typelib, "entry", typelib->data, entry->name, error))
|
|
|
|
return FALSE;
|
2008-02-08 16:31:03 +01:00
|
|
|
|
|
|
|
if ((entry->local && entry->blob_type == BLOB_TYPE_INVALID) ||
|
|
|
|
entry->blob_type > BLOB_TYPE_UNION)
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_DIRECTORY,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Invalid entry type");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (i < header->n_local_entries)
|
|
|
|
{
|
|
|
|
if (!entry->local)
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_DIRECTORY,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Too few local directory entries");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!is_aligned (entry->offset))
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_DIRECTORY,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Misaligned entry");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_blob (typelib, entry->offset, error))
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (entry->local)
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID_DIRECTORY,
|
2008-02-08 16:31:03 +01:00
|
|
|
"Too many local directory entries");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2008-08-21 18:15:55 +02:00
|
|
|
if (!validate_name (typelib, "namespace", typelib->data, entry->offset, error))
|
|
|
|
return FALSE;
|
2008-02-08 16:31:03 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2008-08-09 14:55:32 +02:00
|
|
|
validate_annotations (GTypelib *typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
GError **error)
|
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
Header *header = (Header *)typelib->data;
|
2008-02-08 16:31:03 +01:00
|
|
|
|
|
|
|
if (header->size < header->annotations + header->n_annotations * sizeof (AnnotationBlob))
|
|
|
|
{
|
|
|
|
g_set_error (error,
|
2008-06-08 16:37:30 +02:00
|
|
|
G_TYPELIB_ERROR,
|
|
|
|
G_TYPELIB_ERROR_INVALID,
|
2008-02-08 16:31:03 +01:00
|
|
|
"The buffer is too short");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
gboolean
|
2008-08-09 14:55:32 +02:00
|
|
|
g_typelib_validate (GTypelib *typelib,
|
2008-02-08 16:31:03 +01:00
|
|
|
GError **error)
|
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_header (typelib, error))
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_directory (typelib, error))
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!validate_annotations (typelib, error))
|
2008-02-08 16:31:03 +01:00
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
GQuark
|
2008-06-08 16:37:30 +02:00
|
|
|
g_typelib_error_quark (void)
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
static GQuark quark = 0;
|
|
|
|
if (quark == 0)
|
2008-08-09 14:55:32 +02:00
|
|
|
quark = g_quark_from_static_string ("g-typelib-error-quark");
|
2008-02-08 16:31:03 +01:00
|
|
|
return quark;
|
|
|
|
}
|
|
|
|
|
2008-04-23 03:17:24 +02:00
|
|
|
static const char*
|
2008-08-09 14:55:32 +02:00
|
|
|
find_some_symbol (GTypelib *typelib)
|
2008-04-23 03:17:24 +02:00
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
Header *header = (Header *) typelib->data;
|
2008-04-23 03:17:24 +02:00
|
|
|
gint i;
|
|
|
|
|
|
|
|
for (i = 0; i < header->n_entries; i++)
|
|
|
|
{
|
|
|
|
DirEntry *entry;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
entry = g_typelib_get_dir_entry (typelib, i + 1);
|
2008-04-23 03:17:24 +02:00
|
|
|
|
|
|
|
switch (entry->blob_type)
|
|
|
|
{
|
|
|
|
case BLOB_TYPE_FUNCTION:
|
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
FunctionBlob *blob = (FunctionBlob *) &typelib->data[entry->offset];
|
2008-04-23 03:17:24 +02:00
|
|
|
|
|
|
|
if (blob->symbol)
|
2008-08-09 14:55:32 +02:00
|
|
|
return g_typelib_get_string (typelib, blob->symbol);
|
2008-04-23 03:17:24 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case BLOB_TYPE_OBJECT:
|
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
RegisteredTypeBlob *blob = (RegisteredTypeBlob *) &typelib->data[entry->offset];
|
2008-04-23 03:17:24 +02:00
|
|
|
|
|
|
|
if (blob->gtype_init)
|
2008-08-09 14:55:32 +02:00
|
|
|
return g_typelib_get_string (typelib, blob->gtype_init);
|
2008-04-23 03:17:24 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
2008-02-08 16:31:03 +01:00
|
|
|
|
|
|
|
static inline void
|
2008-08-09 14:55:32 +02:00
|
|
|
_g_typelib_init (GTypelib *typelib)
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
|
|
|
Header *header;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
header = (Header *) typelib->data;
|
2008-02-08 16:31:03 +01:00
|
|
|
if (header->shared_library)
|
|
|
|
{
|
|
|
|
const gchar *shlib;
|
2008-04-23 03:04:43 +02:00
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
shlib = g_typelib_get_string (typelib, header->shared_library);
|
2008-04-23 03:17:24 +02:00
|
|
|
/* note that NULL shlib means to open the main app, which is allowed */
|
|
|
|
|
|
|
|
/* If we do have a shared lib, first be sure the main app isn't already linked to it */
|
|
|
|
if (shlib != NULL)
|
|
|
|
{
|
|
|
|
const char *symbol_in_module;
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
symbol_in_module = find_some_symbol (typelib);
|
2008-04-23 03:17:24 +02:00
|
|
|
if (symbol_in_module != NULL)
|
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
typelib->module = g_module_open (NULL, G_MODULE_BIND_LAZY);
|
|
|
|
if (typelib->module == NULL)
|
2008-04-23 03:17:24 +02:00
|
|
|
{
|
|
|
|
g_warning ("Could not open main app as GModule: %s",
|
|
|
|
g_module_error ());
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
void *sym;
|
2008-08-09 14:55:32 +02:00
|
|
|
if (!g_module_symbol (typelib->module, symbol_in_module, &sym))
|
2008-04-23 03:17:24 +02:00
|
|
|
{
|
|
|
|
/* we will try opening the shlib, symbol is not in app already */
|
2008-08-09 14:55:32 +02:00
|
|
|
g_module_close (typelib->module);
|
|
|
|
typelib->module = NULL;
|
2008-04-23 03:17:24 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
g_warning ("Could not find any symbols in typelib");
|
2008-04-23 03:17:24 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-08-09 14:55:32 +02:00
|
|
|
if (typelib->module == NULL)
|
2008-04-23 03:17:24 +02:00
|
|
|
{
|
2008-08-21 16:21:00 +02:00
|
|
|
gchar *resolved_shlib;
|
|
|
|
|
2008-04-23 03:17:24 +02:00
|
|
|
/* Glade's autoconnect feature and OpenGL's extension mechanism
|
|
|
|
* as used by Clutter rely on dlopen(NULL) to work as a means of
|
|
|
|
* accessing the app's symbols. This keeps us from using
|
|
|
|
* G_MODULE_BIND_LOCAL. BIND_LOCAL may have other issues as well;
|
|
|
|
* in general libraries are not expecting multiple copies of
|
|
|
|
* themselves and are not expecting to be unloaded. So we just
|
|
|
|
* load modules globally for now.
|
|
|
|
*/
|
2008-08-21 16:21:00 +02:00
|
|
|
|
|
|
|
resolved_shlib = g_module_build_path (NULL, shlib);
|
|
|
|
typelib->module = g_module_open (resolved_shlib, G_MODULE_BIND_LAZY);
|
2008-08-09 14:55:32 +02:00
|
|
|
if (typelib->module == NULL)
|
|
|
|
g_warning ("Failed to load shared library referenced by the typelib: %s",
|
2008-04-23 03:17:24 +02:00
|
|
|
g_module_error ());
|
2008-08-21 16:21:00 +02:00
|
|
|
|
|
|
|
g_free (resolved_shlib);
|
2008-04-23 03:17:24 +02:00
|
|
|
}
|
2008-02-08 16:31:03 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2008-06-08 16:37:30 +02:00
|
|
|
* g_typelib_new_from_memory:
|
2008-08-09 14:55:32 +02:00
|
|
|
* @memory: address of memory chunk containing the typelib
|
|
|
|
* @len: length of memory chunk containing the typelib
|
2008-02-08 16:31:03 +01:00
|
|
|
*
|
2008-06-08 16:37:30 +02:00
|
|
|
* Creates a new #GTypelib from a memory location. The memory block
|
2008-08-09 14:55:32 +02:00
|
|
|
* pointed to by @typelib will be automatically g_free()d when the
|
2008-02-08 16:31:03 +01:00
|
|
|
* repository is destroyed.
|
|
|
|
*
|
2008-06-08 16:37:30 +02:00
|
|
|
* Return value: the new #GTypelib
|
2008-02-08 16:31:03 +01:00
|
|
|
**/
|
2008-06-08 16:37:30 +02:00
|
|
|
GTypelib *
|
|
|
|
g_typelib_new_from_memory (guchar *memory, gsize len)
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
2008-06-08 16:37:30 +02:00
|
|
|
GTypelib *meta;
|
2008-02-08 16:31:03 +01:00
|
|
|
|
2008-06-08 16:37:30 +02:00
|
|
|
meta = g_new0 (GTypelib, 1);
|
2008-02-08 16:31:03 +01:00
|
|
|
meta->data = memory;
|
|
|
|
meta->len = len;
|
|
|
|
meta->owns_memory = TRUE;
|
2008-06-08 16:37:30 +02:00
|
|
|
_g_typelib_init (meta);
|
2008-02-08 16:31:03 +01:00
|
|
|
return meta;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2008-06-08 16:37:30 +02:00
|
|
|
* g_typelib_new_from_const_memory:
|
2008-08-09 14:55:32 +02:00
|
|
|
* @memory: address of memory chunk containing the typelib
|
|
|
|
* @len: length of memory chunk containing the typelib
|
2008-02-08 16:31:03 +01:00
|
|
|
*
|
2008-06-08 16:37:30 +02:00
|
|
|
* Creates a new #GTypelib from a memory location.
|
2008-02-08 16:31:03 +01:00
|
|
|
*
|
2008-06-08 16:37:30 +02:00
|
|
|
* Return value: the new #GTypelib
|
2008-02-08 16:31:03 +01:00
|
|
|
**/
|
2008-06-08 16:37:30 +02:00
|
|
|
GTypelib *
|
|
|
|
g_typelib_new_from_const_memory (const guchar *memory, gsize len)
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
2008-06-08 16:37:30 +02:00
|
|
|
GTypelib *meta;
|
2008-02-08 16:31:03 +01:00
|
|
|
|
2008-06-08 16:37:30 +02:00
|
|
|
meta = g_new0 (GTypelib, 1);
|
2008-02-08 16:31:03 +01:00
|
|
|
meta->data = (guchar *) memory;
|
|
|
|
meta->len = len;
|
|
|
|
meta->owns_memory = FALSE;
|
2008-06-08 16:37:30 +02:00
|
|
|
_g_typelib_init (meta);
|
2008-02-08 16:31:03 +01:00
|
|
|
return meta;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2008-06-08 16:37:30 +02:00
|
|
|
* g_typelib_new_from_mapped_file:
|
2008-02-08 16:31:03 +01:00
|
|
|
* @mfile: a #GMappedFile, that will be free'd when the repository is destroyed
|
|
|
|
*
|
2008-06-08 16:37:30 +02:00
|
|
|
* Creates a new #GTypelib from a #GMappedFile.
|
2008-02-08 16:31:03 +01:00
|
|
|
*
|
2008-06-08 16:37:30 +02:00
|
|
|
* Return value: the new #GTypelib
|
2008-02-08 16:31:03 +01:00
|
|
|
**/
|
2008-06-08 16:37:30 +02:00
|
|
|
GTypelib *
|
|
|
|
g_typelib_new_from_mapped_file (GMappedFile *mfile)
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
2008-06-08 16:37:30 +02:00
|
|
|
GTypelib *meta;
|
2008-02-08 16:31:03 +01:00
|
|
|
|
2008-06-08 16:37:30 +02:00
|
|
|
meta = g_new0 (GTypelib, 1);
|
2008-02-08 16:31:03 +01:00
|
|
|
meta->mfile = mfile;
|
|
|
|
meta->owns_memory = FALSE;
|
|
|
|
meta->data = (guchar *) g_mapped_file_get_contents (mfile);
|
|
|
|
meta->len = g_mapped_file_get_length (mfile);
|
2008-06-08 16:37:30 +02:00
|
|
|
_g_typelib_init (meta);
|
2008-02-08 16:31:03 +01:00
|
|
|
return meta;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2008-06-08 16:37:30 +02:00
|
|
|
* g_typelib_free:
|
2008-08-09 14:55:32 +02:00
|
|
|
* @typelib: a #GTypelib
|
2008-02-08 16:31:03 +01:00
|
|
|
*
|
2008-06-08 16:37:30 +02:00
|
|
|
* Free a #GTypelib.
|
2008-02-08 16:31:03 +01:00
|
|
|
**/
|
|
|
|
void
|
2008-08-09 14:55:32 +02:00
|
|
|
g_typelib_free (GTypelib *typelib)
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
if (typelib->mfile)
|
|
|
|
g_mapped_file_free (typelib->mfile);
|
2008-02-08 16:31:03 +01:00
|
|
|
else
|
2008-08-09 14:55:32 +02:00
|
|
|
if (typelib->owns_memory)
|
|
|
|
g_free (typelib->data);
|
|
|
|
if (typelib->module)
|
|
|
|
g_module_close (typelib->module);
|
|
|
|
g_free (typelib);
|
2008-02-08 16:31:03 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2008-06-08 16:37:30 +02:00
|
|
|
* g_typelib_set_module:
|
2008-08-09 14:55:32 +02:00
|
|
|
* @typelib: a #GTypelib instance
|
2008-02-08 16:31:03 +01:00
|
|
|
* @module: a #GModule; takes ownership of this module
|
|
|
|
*
|
2008-08-09 14:55:32 +02:00
|
|
|
* Sets the target module for all symbols referenced by the typelib.
|
2008-02-08 16:31:03 +01:00
|
|
|
**/
|
|
|
|
void
|
2008-08-09 14:55:32 +02:00
|
|
|
g_typelib_set_module (GTypelib *typelib, GModule *module)
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
if (typelib->module)
|
|
|
|
g_module_close (typelib->module);
|
|
|
|
typelib->module = module;
|
2008-02-08 16:31:03 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
const gchar *
|
2008-08-09 14:55:32 +02:00
|
|
|
g_typelib_get_namespace(GTypelib *typelib)
|
2008-02-08 16:31:03 +01:00
|
|
|
{
|
2008-08-09 14:55:32 +02:00
|
|
|
return g_typelib_get_string (typelib, ((Header *) typelib->data)->namespace);
|
2008-02-08 16:31:03 +01:00
|
|
|
}
|