luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[INTERPRETER]

Browse source 
* BUG: The event handler check routine should not crash anymore.


git-svn-id: svn://localhost/gambas/trunk@5249 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2012-10-22 16:22:15 +00:00
parent fb33a73b86
commit c5debe2304
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
main/gbx/gbx_event.c
View file

@ -42,16 +42,23 @@ static EVENT_POST *_post_list = NULL;
static void check_event_method(CLASS *class, const char *name, CLASS_DESC_METHOD *desc, CLASS_EVENT *event)
{
if (event->n_param < desc->npmin)
int n = event->n_param;
if (n < desc->npmin)
{
/*printf("event->n_param = %d desc->npmin = %d desc->npmax = %d\n", event->n_param, desc->npmin, desc->npmax);*/
THROW(E_EVENT, CLASS_get_name(class), name, "Too many arguments");
}
if (event->n_param > desc->npmax && !desc->npvar)
THROW(E_EVENT, CLASS_get_name(class), name, "Not enough arguments");
if (n > desc->npmax)
{
if (!desc->npvar)
THROW(E_EVENT, CLASS_get_name(class), name, "Not enough arguments");
n = desc->npmax;
}
if (TYPE_compare_signature(desc->signature, desc->npmax, (TYPE *)event->param, desc->npmax))
if (TYPE_compare_signature(desc->signature, n, (TYPE *)event->param, n))
THROW(E_EVENT, CLASS_get_name(class), name, "Type mismatch");
if (desc->type != T_VOID)