diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-06-04 10:43:55 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-06-04 10:43:55 +0200 |
| commit | e891f1f2e166a60cd29dd0998bd0fa63b05d30cd (patch) | |
| tree | 00381484367e085183f5ae1522d584d455a5d1f3 | |
| parent | f98c251d56d5c6d69f9ab3e0f3b47d647c9e7535 (diff) | |
| download | json-dbus-bridge-e891f1f2e166a60cd29dd0998bd0fa63b05d30cd.tar.gz json-dbus-bridge-e891f1f2e166a60cd29dd0998bd0fa63b05d30cd.tar.xz | |
[src] cleanup error handling
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | src/bridge_request.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/bridge_request.c b/src/bridge_request.c index 50c0024..e7e90f8 100644 --- a/src/bridge_request.c +++ b/src/bridge_request.c @@ -256,6 +256,11 @@ int bridge_request_dbus_params_dict(bridge_request_t *self, json_object_object_foreach(element, key, tmp) #endif { + if (!tmp) { + bridge_request_error(self, + "unexpected 'null' value in json object."); + return EINVAL; + } DBusSignatureIter tmpSigArgs = sigArgs; dbus_message_iter_open_container(it, DBUS_TYPE_DICT_ENTRY, 0,&args); dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &key); @@ -282,12 +287,6 @@ int bridge_request_dbus_params_element(bridge_request_t *self, int type; int ret = 0; - if (!element) { - bridge_request_error(self, - "unecpected 'null' element found."); - return EINVAL; - } - type = dbus_signature_iter_get_current_type(sigIt); if (dbus_type_is_basic(type)) { @@ -365,7 +364,7 @@ int bridge_request_dbus_params_element(bridge_request_t *self, tmp = json_object_array_get_idx(element, i); if (!tmp) { bridge_request_error(self, - "value expected."); + "unexpected 'null' element in json array."); return EINVAL; } ret = bridge_request_dbus_params_element(self, |