From 9578e366c28fa0e4f17202d90260a68e941c8f21 Mon Sep 17 00:00:00 2001 From: OBATA Akio Date: Sun, 9 Feb 2020 17:57:53 +0900 Subject: [PATCH] Remove unwanted memory allocation for response It is expected as pointer to struct response with size fo the struct, not pointer to the pointer, but never returned to the caller. It should be allocated by the caller. Signed-off-by: OBATA Akio --- src/caldav.c | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/src/caldav.c b/src/caldav.c index 9e2b0af..a097946 100644 --- a/src/caldav.c +++ b/src/caldav.c @@ -301,12 +301,9 @@ CALDAV_RESPONSE caldav_get_object(response *result, CALDAV_RESPONSE caldav_response; g_return_val_if_fail(info != NULL, TRUE); + g_return_val_if_fail(result != NULL, NOTIMPLEMENTED); init_runtime(info); - if (!result) { - result = malloc(sizeof(response *)); - memset(result, '\0', sizeof(response *)); - } init_caldav_settings(&settings); settings.ACTION = GET; settings.start = start; @@ -365,12 +362,9 @@ CALDAV_RESPONSE caldav_getall_object(response* result, CALDAV_RESPONSE caldav_response; g_return_val_if_fail(info != NULL, TRUE); + g_return_val_if_fail(result != NULL, NOTIMPLEMENTED); init_runtime(info); - if (!result) { - result = malloc(sizeof(response *)); - memset(result, '\0', sizeof(response *)); - } init_caldav_settings(&settings); settings.ACTION = GETALL; if (info->options->debug) @@ -547,12 +541,9 @@ CALDAV_RESPONSE caldav_tasks_get_object(response *result, CALDAV_RESPONSE caldav_response; g_return_val_if_fail(info != NULL, TRUE); + g_return_val_if_fail(result != NULL, NOTIMPLEMENTED); init_runtime(info); - if (!result) { - result = malloc(sizeof(response *)); - memset(result, '\0', sizeof(response *)); - } init_caldav_settings(&settings); settings.ACTION = GETTASKS; settings.start = start; @@ -611,12 +602,9 @@ CALDAV_RESPONSE caldav_tasks_getall_object(response* result, CALDAV_RESPONSE caldav_response; g_return_val_if_fail(info != NULL, TRUE); + g_return_val_if_fail(result != NULL, NOTIMPLEMENTED); init_runtime(info); - if (!result) { - result = malloc(sizeof(response *)); - memset(result, '\0', sizeof(response *)); - } init_caldav_settings(&settings); settings.ACTION = GETALLTASKS; if (info->options->debug) @@ -673,12 +661,9 @@ CALDAV_RESPONSE caldav_get_displayname(response* result, CALDAV_RESPONSE caldav_response; g_return_val_if_fail(info != NULL, TRUE); + g_return_val_if_fail(result != NULL, NOTIMPLEMENTED); init_runtime(info); - if (!result) { - result = malloc(sizeof(response *)); - memset(result, '\0', sizeof(response *)); - } init_caldav_settings(&settings); settings.ACTION = GETCALNAME; if (info->options->debug) @@ -788,12 +773,9 @@ CALDAV_RESPONSE caldav_get_freebusy(response *result, CALDAV_RESPONSE caldav_response; g_return_val_if_fail(info != NULL, TRUE); + g_return_val_if_fail(result != NULL, NOTIMPLEMENTED); init_runtime(info); - if (!result) { - result = malloc(sizeof(response *)); - memset(result, '\0', sizeof(response *)); - } init_caldav_settings(&settings); settings.ACTION = FREEBUSY; settings.start = start;