mirrors/mastodont-c
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix parsing bugs

Browse source 
FossilOrigin-Name: 06949ab8beecb45c46495b7e7782aedf4306dcac744546964a69419f1611cb65
This commit is contained in:
me@ow.nekobit.net 2022-03-20 05:11:57 +00:00
parent e77f93dc93
commit 80c058de65
3 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/account.c
View file

@ -28,7 +28,7 @@ void _mstdnt_val_account_call(cJSON* v, void* _type)
{
struct mstdnt_account* type = _type;
mstdnt_account_from_json(type, v->child);
mstdnt_account_from_json(type, v);
}
void _mstdnt_val_malloc_account_call(cJSON* v, void* _type)
@ -38,7 +38,7 @@ void _mstdnt_val_malloc_account_call(cJSON* v, void* _type)
*type = malloc(sizeof(struct mstdnt_account*));
if (*type)
mstdnt_account_from_json(*type, v->child);
mstdnt_account_from_json(*type, v);
}
int mstdnt_account_from_result(struct mstdnt_fetch_results* results,

18
src/notification.c
View file

@ -48,8 +48,6 @@ int mstdnt_notification_from_json(struct mstdnt_notification* notif, cJSON* js)
{
cJSON* v;
/* Allocate optional params */
struct _mstdnt_val_ref vals[] = {
{ "account", &(notif->account), _mstdnt_val_malloc_account_call },
{ "created_at", &(notif->created_at), _mstdnt_val_string_call },
@ -85,6 +83,11 @@ int mstdnt_notifications_from_result(struct mstdnt_fetch_results* results,
cJSON_ArrayForEach(notif_j_list, root)
{
/* Null out values incase no match */
(*notif)[i].account = NULL;
(*notif)[i].status = NULL;
/* notif[i]->pleroma = NULL; */
mstdnt_notification_from_json((*notif) + i++, notif_j_list->child);
}
@ -137,7 +140,7 @@ int mastodont_get_notifications(mastodont_t* data,
NULL, 0,
CURLOPT_HTTPGET,
&cb_args,
_mstdnt_statuses_result_callback,
_mstdnt_notifications_result_callback,
};
return mastodont_request(data, &req_args);
@ -155,8 +158,11 @@ void mstdnt_cleanup_notifications(struct mstdnt_notification* notifs, size_t not
void mstdnt_cleanup_notification(struct mstdnt_notification* notif)
{
free(notif->account);
mstdnt_cleanup_status(notif->status);
free(notif->status);
if (notif->account) free(notif->account);
if (notif->status)
{
mstdnt_cleanup_status(notif->status);
free(notif->status);
}
}

4
src/status.c
View file

@ -26,7 +26,7 @@ void _mstdnt_val_status_call(cJSON* v, void* _type)
{
struct mstdnt_status* type = _type;
mstdnt_status_from_json(type, v->child);
mstdnt_status_from_json(type, v);
}
@ -37,7 +37,7 @@ void _mstdnt_val_malloc_status_call(cJSON* v, void* _type)
*type = malloc(sizeof(struct mstdnt_status*));
if (*type)
mstdnt_status_from_json(*type, v->child);
mstdnt_status_from_json(*type, v);
}
int mstdnt_status_from_json(struct mstdnt_status* status, cJSON* js)