check memory leak

giancarlopro · Mar 30, 2018 · 227e708 · 227e708
1 parent 8f074bc
commit 227e708
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 3 deletions.
diff --git a/src/framebot.c b/src/framebot.c
@@ -61,16 +61,19 @@ Framebot *get_updates (Bot *bot, Framebot *framebot, long int offset, long int l
         offset, limit, timeout, IF_STRING_NULL(allowed_updates) );
 
     if( !framebot ){
-        framebot = (Framebot *)calloc(1, sizeof( Framebot ));
+        framebot = calloc(1, sizeof( Framebot ));
     }
 
     if(!s_json){
         return framebot;
     }
 
-
     size_t length, i;
     length = json_array_size(s_json->content);
+    if(length == 0){
+        close_json(s_json);
+        return framebot;
+    }
 
     for (i = 0; i < length; i++) {
         up = update_parse(json_array_get(s_json->content, i));

diff --git a/src/network.c b/src/network.c
@@ -541,6 +541,7 @@ MemStore * call_method_upload(const char * token, IFile ifile){
         /* always cleanup */
         curl_easy_cleanup(curl);
 
+        free(url);
         /* then cleanup the form */
         curl_mime_free(form);
 

diff --git a/src/objects.c b/src/objects.c
@@ -322,7 +322,8 @@ Document *document(const char *file_id,PhotoSize *thumb, const char *file_name,
 
 void document_free(Document *document){
     free(document->file_id);
-    photo_size_free(document->thumb);
+    if(document->thumb)
+        photo_size_free(document->thumb);
     free(document->file_name);
     free(document->mime_type);
     free(document);

diff --git a/test/test_senddocument.c b/test/test_senddocument.c
@@ -39,6 +39,7 @@ int _document(){
 	result = send_document_chat(_bot, chat_id, filename, NULL, 0, 0, NULL);
 	if(result){
 		printf(BLUE "OK\n" COLOR_RESET);
+		message_free(result);
 	}
 	else{
 		Error *error = get_error();
@@ -51,6 +52,7 @@ int _document(){
 	result = send_document_chat(_bot, chat_id, filename, NULL, 0, 0, NULL);
 	if(result){
 		printf(BLUE "OK\n" COLOR_RESET);
+		message_free(result);
 	}
 	else{
 		Error *error = get_error();
@@ -63,6 +65,7 @@ int _document(){
 	result = send_document_chat(_bot, chat_id, filename, "caption", 0, 0, NULL);
 	if(result){
 		printf(BLUE "OK\n" COLOR_RESET);
+		message_free(result);
 	}
 	else{
 		Error *error = get_error();
@@ -87,6 +90,8 @@ int _document(){
 	Message * forward = send_document_chat(_bot, chat_id, filename, "caption", 1, result->message_id, NULL);
 	if(result){
 		printf(BLUE "OK\n" COLOR_RESET);
+		message_free(result);
+		message_free(forward);
 	}
 	else{
 		Error *error = get_error();
@@ -97,6 +102,20 @@ int _document(){
 	return 0;
 }
 
+void _free(Framebot *update){
+	Update * m = NULL, *n = NULL;
+
+	m = update->up_message;
+	framebot_free(update);
+
+	while(m){
+		n = m->next;
+		update_free(m);
+		m = n;
+	}
+}
+
+
 int main(int argc, char *argv[]){
 	framebot_init();
 
@@ -125,8 +144,11 @@ int main(int argc, char *argv[]){
 			_document();
 			break;
 		}
+		update->up_message = update->up_message->next;
 	}
 
+	_free(update);
+
 	if(valid_username == 0)
 		printf("Username not found");