Merge pull request #274 from vitalyster/notnull

SkypeWeb : Check JsonNode is not null where possible

2 files changed, 9 insertions, 9 deletions

diff --git a/skypeweb/skypeweb_contacts.c b/skypeweb/skypeweb_contacts.c
index 541590e..5b3c4ee 100644
--- a/skypeweb/skypeweb_contacts.c
+++ b/skypeweb/skypeweb_contacts.c
@@ -175,7 +175,7 @@ skypeweb_got_vm_download_info(SkypeWebAccount *sa, JsonNode *node, gpointer user
 	gint64 fileSize;

 	const gchar *url, *assetId, *status;

 	gchar *filename;

-	

+	if (node == NULL || json_node_get_node_type(node) != JSON_NODE_OBJECT) return;	

 	obj = json_node_get_object(node);

 	files = json_object_get_array_member(obj, "files");

 	file = json_array_get_object_element(files, 0);

@@ -210,7 +210,7 @@ skypeweb_got_vm_info(SkypeWebAccount *sa, JsonNode *node, gpointer user_data)
 	PurpleConversation *conv = user_data;

 	JsonObject *obj, *response, *media_stream;

 	const gchar *filename;

-	

+	if (node == NULL || json_node_get_node_type(node) != JSON_NODE_OBJECT) return;	

 	obj = json_node_get_object(node);

 	response = json_object_get_object_member(obj, "response");

 	media_stream = json_object_get_object_member(response, "media_stream");

@@ -248,7 +248,7 @@ skypeweb_got_self_details(SkypeWebAccount *sa, JsonNode *node, gpointer user_dat
 	const gchar *old_alias;

 	const gchar *displayname;

 	const gchar *username;

-	

+	if (node == NULL || json_node_get_node_type(node) != JSON_NODE_OBJECT) return;	

 	userobj = json_node_get_object(node);

 	

 	username = json_object_get_string_member(userobj, "username");

@@ -479,7 +479,7 @@ skypeweb_got_info(SkypeWebAccount *sa, JsonNode *node, gpointer user_data)
 	PurpleBuddy *buddy;

 	SkypeWebBuddy *sbuddy;

 	const gchar *new_avatar;

-	

+	if (node == NULL || json_node_get_node_type(node) != JSON_NODE_OBJECT) return;	

 	userobj = json_node_get_object(node);

 	

 	user_info = purple_notify_user_info_new();

@@ -778,4 +778,4 @@ skypeweb_buddy_unblock(PurpleConnection *pc, const char *name)
 	skypeweb_post_or_get(sa, SKYPEWEB_METHOD_PUT | SKYPEWEB_METHOD_SSL, SKYPEWEB_CONTACTS_HOST, url, "", NULL, NULL, TRUE);

 	

 	g_free(url);

-}
\ No newline at end of file
+}

diff --git a/skypeweb/skypeweb_messages.c b/skypeweb/skypeweb_messages.c
index e4fbc4e..7037362 100644
--- a/skypeweb/skypeweb_messages.c
+++ b/skypeweb/skypeweb_messages.c
@@ -486,7 +486,7 @@ skypeweb_got_thread_users(SkypeWebAccount *sa, JsonNode *node, gpointer user_dat
 	if (conv == NULL)

 		return;

 	purple_conv_chat_clear_users(PURPLE_CONV_CHAT(conv));

-	

+	if (node == NULL || json_node_get_node_type(node) != JSON_NODE_OBJECT)	return;

 	response = json_node_get_object(node);

 	members = json_object_get_array_member(response, "members");

 	length = json_array_get_length(members);

@@ -528,7 +528,7 @@ skypeweb_got_conv_history(SkypeWebAccount *sa, JsonNode *node, gpointer user_dat
 	JsonObject *obj;

 	JsonArray *messages;

 	gint index, length;

-	

+	if (node == NULL || json_node_get_node_type(node) != JSON_NODE_OBJECT) return;	

 	obj = json_node_get_object(node);

 	messages = json_object_get_array_member(obj, "messages");

 	length = json_array_get_length(messages);

@@ -568,7 +568,7 @@ skypeweb_got_all_convs(SkypeWebAccount *sa, JsonNode *node, gpointer user_data)
 	JsonObject *obj;

 	JsonArray *conversations;

 	gint index, length;

-	

+	if (node == NULL || json_node_get_node_type(node) != JSON_NODE_OBJECT) return;

 	obj = json_node_get_object(node);

 	conversations = json_object_get_array_member(obj, "conversations");

 	length = json_array_get_length(conversations);

@@ -612,7 +612,7 @@ skypeweb_got_roomlist_threads(SkypeWebAccount *sa, JsonNode *node, gpointer user
 	JsonObject *obj;

 	JsonArray *conversations;

 	gint index, length;

-	

+	if (node == NULL || json_node_get_node_type(node) != JSON_NODE_OBJECT) return;	

 	obj = json_node_get_object(node);

 	conversations = json_object_get_array_member(obj, "conversations");

 	length = json_array_get_length(conversations);