darlinghq/darling-dbuskit
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-dbuskit.git synced 2024-11-30 07:30:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a bug where the field index for a structure was not properly incremented

Browse Source 
when deserialising a D-Bus message.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/dbuskit/trunk@32233 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Niels Grewe 2011-02-19 19:40:48 +00:00
parent d9f58ad17d
commit 9039c429a8
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2011-02-19 Niels Grewe <niels.grewe@halbordnung.de>
* Source/DKArgument.m: Fix a bug where the field index for
structure was not properly incremented in deserialization.
2011-02-19 Niels Grewe <niels.grewe@halbordnung.de>
* Source/DKArgument.m: Fix a bug where deserializing an empty

18
Source/DKArgument.m
View File

@ -890,9 +890,10 @@ DKDBusTypeForUnboxingObject(id object)
const char *expectedType;
// Check that the method contains the expected type.
NSAssert3((dbus_message_iter_get_arg_type(iter) == DBusType),
int iterType = dbus_message_iter_get_arg_type(iter);
NSAssert3((iterType == DBusType),
@"Type mismatch between D-Bus message and introspection data. Got '%ld', expected '%ld' in method %@." ,
dbus_message_iter_get_arg_type(iter), DBusType, [parent name]);
iterType, DBusType, [parent name]);
if (doBox)
{
@ -949,11 +950,12 @@ DKDBusTypeForUnboxingObject(id object)
{
// All basic types are guaranteed to fit into 64bit.
uint64_t buffer = 0;
int iterType = dbus_message_iter_get_arg_type(iter);
// Check that the method contains the expected type.
NSAssert3((dbus_message_iter_get_arg_type(iter) == DBusType),
NSAssert3((iterType == DBusType),
@"Type mismatch between D-Bus message and introspection data. Got '%ld', expected '%ld' in method %@." ,
dbus_message_iter_get_arg_type(iter), DBusType, [parent name]);
iterType, DBusType, [parent name]);
dbus_message_iter_get_basic(iter, (void*)&buffer);
@ -968,10 +970,12 @@ DKDBusTypeForUnboxingObject(id object)
DKEndpoint *endpoint = [ancestor _endpoint];
NSString *path = nil;
DKProxyStandin *standin = nil;
int iterType = dbus_message_iter_get_arg_type(iter);
// Check that the method contains the expected type.
NSAssert3((dbus_message_iter_get_arg_type(iter) == DBusType),
NSAssert3((iterType == DBusType),
@"Type mismatch between D-Bus message and introspection data. Got '%ld', expected '%ld' in method %@." ,
dbus_message_iter_get_arg_type(iter), DBusType, [parent name]);
iterType, DBusType, [parent name]);
dbus_message_iter_get_basic(iter, (void*)&buffer);
path = [[NSString alloc] initWithUTF8String: buffer];
@ -1669,7 +1673,7 @@ DKDBusTypeForUnboxingObject(id object)
obj = theNull;
}
[theArray addObject: obj];
} while (dbus_message_iter_next(&subIter) && (index < count));
} while (dbus_message_iter_next(&subIter) && (++index < count));
returnArray = [NSArray arrayWithArray: theArray];
[theArray release];