fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-17 15:58:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle empty iterators properly!

Browse source
This commit is contained in:
Owen Fraser-Green 2004-05-01 19:59:58 +00:00
parent e16dafeb5f
commit 3c6ef3df27
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mono/Arguments.cs
View file

@ -181,9 +181,9 @@ namespace DBus
string key = "";
// Iterate through the parameters getting the type codes to a string
bool empty = dbus_message_iter_init(message.RawMessage, iter);
bool notEmpty = dbus_message_iter_init(message.RawMessage, iter);
if (!empty) {
if (notEmpty) {
do {
char code = (char) dbus_message_iter_get_arg_type(iter);
if (code == '\0')
@ -221,7 +221,7 @@ namespace DBus
{
private Arguments arguments;
private bool started = false;
private bool empty = false;
private bool notEmpty = false;
private IntPtr iter = Marshal.AllocCoTaskMem(Arguments.DBusMessageIterSize);
public ArgumentsEnumerator(Arguments arguments)
@ -241,13 +241,13 @@ namespace DBus
return dbus_message_iter_next(iter);
} else {
started = true;
return !empty;
return notEmpty;
}
}
public void Reset()
{
empty = dbus_message_iter_init(arguments.message.RawMessage, iter);
notEmpty = dbus_message_iter_init(arguments.message.RawMessage, iter);
started = false;
}

4
mono/DBusType/Array.cs
View file

@ -36,12 +36,12 @@ namespace DBus.DBusType
IntPtr arrayIter = Marshal.AllocCoTaskMem(Arguments.DBusMessageIterSize);
int elementTypeCode;
bool empty = dbus_message_iter_init_array_iterator(iter, arrayIter, out elementTypeCode);
bool notEmpty = dbus_message_iter_init_array_iterator(iter, arrayIter, out elementTypeCode);
this.elementType = (Type) Arguments.DBusTypes[(char) elementTypeCode];
elements = new ArrayList();
if (!empty) {
if (notEmpty) {
do {
object [] pars = new Object[2];
pars[0] = arrayIter;

4
mono/DBusType/Dict.cs
View file

@ -31,11 +31,11 @@ namespace DBus.DBusType
{
IntPtr dictIter = Marshal.AllocCoTaskMem(Arguments.DBusMessageIterSize);
bool empty = dbus_message_iter_init_dict_iterator(iter, dictIter);
bool notEmpty = dbus_message_iter_init_dict_iterator(iter, dictIter);
this.val = new Hashtable();
if (!empty) {
if (notEmpty) {
do {
string key = dbus_message_iter_get_dict_key(dictIter);