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

[GB.DBUS]

Browse source 
* BUG: Fix string leak in signature marshalling routine.


git-svn-id: svn://localhost/gambas/trunk@8001 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2016-11-27 21:36:01 +00:00
parent 386ce693e7
commit 5e61c2e436
1 changed files with 54 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
gb.dbus/src/helper.c
View file

@ -808,7 +808,8 @@ static bool define_arguments(DBusMessage *message, const char *signature, GB_ARR
DBusMessageIter iter;
DBusSignatureIter siter;
char *sign;
bool err;
char *arg_sign;
bool err = FALSE;
if (arguments)
{
@ -821,54 +822,64 @@ static bool define_arguments(DBusMessage *message, const char *signature, GB_ARR
type = GB_T_NULL;
}
//fprintf(stderr, "define_arguments: %s %d %ld\n", signature, nparam, type);
#ifdef DEBUG_ARG
fprintf(stderr, "define_arguments: %s %d %ld\n", signature, nparam, type);
#endif
if (signature && *signature)
if (!signature || !*signature)
{
dbus_message_iter_init_append(message, &iter);
dbus_signature_iter_init(&siter, signature);
for (n = 0; n < nparam; n++)
if (nparam > 0)
{
value.type = type;
GB.ReadValue(&value, GB.Array.Get(arguments, n), type);
GB.BorrowValue(&value);
sign = dbus_signature_iter_get_signature(&siter);
#ifdef DEBUG_ARG
fprintf(stderr, "[%d] %s: ", n, sign);
#endif
err = append_arg(&iter, sign, &value);
#ifdef DEBUG_ARG
fprintf(stderr, "\n");
#endif
dbus_free(sign);
if (err)
return TRUE;
if (!dbus_signature_iter_next(&siter))
{
if (n < (nparam - 1))
{
GB.Error("Too many arguments");
return TRUE;
}
return FALSE;
}
GB.Error("Too many arguments");
return TRUE;
}
GB.Error("Not enough arguments");
return TRUE;
}
else
{
if (nparam == 0)
else
return FALSE;
GB.Error("Too many arguments");
return TRUE;
}
sign = GB.NewZeroString(signature);
dbus_message_iter_init_append(message, &iter);
dbus_signature_iter_init(&siter, sign);
for (n = 0; n < nparam; n++)
{
value.type = type;
GB.ReadValue(&value, GB.Array.Get(arguments, n), type);
GB.BorrowValue(&value);
arg_sign = dbus_signature_iter_get_signature(&siter);
#ifdef DEBUG_ARG
fprintf(stderr, "[%d] %s: ", n, arg_sign);
#endif
err = append_arg(&iter, arg_sign, &value);
#ifdef DEBUG_ARG
fprintf(stderr, "\n");
#endif
dbus_free(arg_sign);
if (err)
goto __RETURN;
if (!dbus_signature_iter_next(&siter))
{
if (n < (nparam - 1))
{
GB.Error("Too many arguments");
err = TRUE;
}
goto __RETURN;
}
}
GB.Error("Not enough arguments");
err = TRUE;
__RETURN:
GB.FreeString(&sign);
return err;
}
bool DBUS_call_method(DBusConnection *connection, const char *application, const char *path, const char *interface, const char *method,