X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fagent-connman.c;h=e4850a8f7f0a3c39ab7af3b984bf07aa121e422a;hb=refs%2Fheads%2Faccepted%2Ftizen_5.5_unified_wearable_hotfix;hp=177cbe0a0bb7440af3bd5f356d84eacb5b7e0953;hpb=6f5ffa18c1f8cf226313d9a8c9accb8781bf4a8c;p=platform%2Fupstream%2Fconnman.git

diff --git a/src/agent-connman.c b/src/agent-connman.c
index 177cbe0..e4850a8 100755
--- a/src/agent-connman.c
+++ b/src/agent-connman.c
@@ -100,73 +100,101 @@ static void request_input_passphrase_reply(DBusMessage *reply, void *user_data)
 		DBusMessageIter entry, value;
 
 		dbus_message_iter_recurse(&dict, &entry);
-		if (dbus_message_iter_get_arg_type(&entry) != DBUS_TYPE_STRING)
+		if (dbus_message_iter_get_arg_type(&entry) != DBUS_TYPE_STRING) {
+			error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
 			break;
+		}
 
 		dbus_message_iter_get_basic(&entry, &key);
 
 		if (g_str_equal(key, "Identity")) {
 			dbus_message_iter_next(&entry);
 			if (dbus_message_iter_get_arg_type(&entry)
-							!= DBUS_TYPE_VARIANT)
+							!= DBUS_TYPE_VARIANT) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
 				break;
+			}
+
 			dbus_message_iter_recurse(&entry, &value);
+			if (dbus_message_iter_get_arg_type(&value) != DBUS_TYPE_STRING) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
+				break;
+			}
+
 			dbus_message_iter_get_basic(&value, &identity);
 
 		} else if (g_str_equal(key, "Passphrase")) {
 			dbus_message_iter_next(&entry);
 			if (dbus_message_iter_get_arg_type(&entry)
-							!= DBUS_TYPE_VARIANT)
+							!= DBUS_TYPE_VARIANT) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
 				break;
+			}
+
 			dbus_message_iter_recurse(&entry, &value);
+			if (dbus_message_iter_get_arg_type(&value) != DBUS_TYPE_STRING) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
+				break;
+			}
+
 			dbus_message_iter_get_basic(&value, &passphrase);
 
 		} else if (g_str_equal(key, "WPS")) {
-			wps = true;
 
 			dbus_message_iter_next(&entry);
 			if (dbus_message_iter_get_arg_type(&entry)
-							!= DBUS_TYPE_VARIANT)
+							!= DBUS_TYPE_VARIANT) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
 				break;
+			}
+
 			dbus_message_iter_recurse(&entry, &value);
+			if (dbus_message_iter_get_arg_type(&value) != DBUS_TYPE_STRING) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
+				break;
+			}
+
+			wps = true;
 			dbus_message_iter_get_basic(&value, &wpspin);
 			break;
 		} else if (g_str_equal(key, "Name")) {
 			dbus_message_iter_next(&entry);
 			if (dbus_message_iter_get_arg_type(&entry)
-							!= DBUS_TYPE_VARIANT)
+							!= DBUS_TYPE_VARIANT) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
 				break;
+			}
+
 			dbus_message_iter_recurse(&entry, &value);
+			if (dbus_message_iter_get_arg_type(&value) != DBUS_TYPE_STRING) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
+				break;
+			}
+
 			dbus_message_iter_get_basic(&value, &name);
 			name_len = strlen(name);
 		} else if (g_str_equal(key, "SSID")) {
-#if defined TIZEN_EXT
-			DBusMessageIter array;
-#endif
+			DBusMessageIter array_iter;
+
 			dbus_message_iter_next(&entry);
 			if (dbus_message_iter_get_arg_type(&entry)
-							!= DBUS_TYPE_VARIANT)
-				break;
-#if defined TIZEN_EXT
-			dbus_message_iter_recurse(&entry, &array);
-			if (dbus_message_iter_get_arg_type(&array)
-							!= DBUS_TYPE_ARRAY)
-				break;
-			dbus_message_iter_recurse(&array, &value);
-			if (dbus_message_iter_get_arg_type(&value)
-							!= DBUS_TYPE_BYTE)
+							!= DBUS_TYPE_VARIANT) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
 				break;
-#else
-
+			}
 			dbus_message_iter_recurse(&entry, &value);
 			if (dbus_message_iter_get_arg_type(&value)
-							!= DBUS_TYPE_VARIANT)
+							!= DBUS_TYPE_ARRAY) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
 				break;
-			if (dbus_message_iter_get_element_type(&value)
-							!= DBUS_TYPE_VARIANT)
+			}
+			dbus_message_iter_recurse(&value, &array_iter);
+			if (dbus_message_iter_get_arg_type(&array_iter)
+							!= DBUS_TYPE_BYTE) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
 				break;
-#endif
-			dbus_message_iter_get_fixed_array(&value, &name,
+			}
+			dbus_message_iter_get_fixed_array(&array_iter, &name,
 							&name_len);
 		}
 		dbus_message_iter_next(&dict);
@@ -417,17 +445,33 @@ static void request_input_login_reply(DBusMessage *reply, void *user_data)
 		if (g_str_equal(key, "Username")) {
 			dbus_message_iter_next(&entry);
 			if (dbus_message_iter_get_arg_type(&entry)
-							!= DBUS_TYPE_VARIANT)
+							!= DBUS_TYPE_VARIANT) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
 				break;
+			}
+
 			dbus_message_iter_recurse(&entry, &value);
+			if (dbus_message_iter_get_arg_type(&value) != DBUS_TYPE_STRING) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
+				break;
+			}
+
 			dbus_message_iter_get_basic(&value, &username);
 
 		} else if (g_str_equal(key, "Password")) {
 			dbus_message_iter_next(&entry);
 			if (dbus_message_iter_get_arg_type(&entry) !=
-							DBUS_TYPE_VARIANT)
+							DBUS_TYPE_VARIANT) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
 				break;
+			}
+
 			dbus_message_iter_recurse(&entry, &value);
+			if (dbus_message_iter_get_arg_type(&value) != DBUS_TYPE_STRING) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
+				break;
+			}
+
 			dbus_message_iter_get_basic(&value, &password);
 		}
 
@@ -723,8 +767,10 @@ static void request_peer_authorization_reply(DBusMessage *reply,
 		DBusMessageIter entry, value;
 
 		dbus_message_iter_recurse(&dict, &entry);
-		if (dbus_message_iter_get_arg_type(&entry) != DBUS_TYPE_STRING)
+		if (dbus_message_iter_get_arg_type(&entry) != DBUS_TYPE_STRING) {
+			error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
 			break;
+		}
 
 		dbus_message_iter_get_basic(&entry, &key);
 
@@ -733,9 +779,17 @@ static void request_peer_authorization_reply(DBusMessage *reply,
 
 			dbus_message_iter_next(&entry);
 			if (dbus_message_iter_get_arg_type(&entry)
-							!= DBUS_TYPE_VARIANT)
+							!= DBUS_TYPE_VARIANT) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
 				break;
+			}
+
 			dbus_message_iter_recurse(&entry, &value);
+			if (dbus_message_iter_get_arg_type(&value) != DBUS_TYPE_STRING) {
+				error = CONNMAN_ERROR_INTERFACE ".InvalidArguments";
+				break;
+			}
+
 			dbus_message_iter_get_basic(&value, &wpspin);
 			break;
 		}