Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Email Parser: Reduce message multipart json logic complexity #1347

Merged
merged 1 commit into from
Sep 1, 2024
Merged

Email Parser: Reduce message multipart json logic complexity #1347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 0 additions & 39 deletions libclamav/json_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,45 +352,6 @@ json_object *cli_jsonobj(json_object *obj, const char *key)
return newobj;
}

/* adding an object does NOT increment reference count */
cl_error_t cli_json_addowner(json_object *owner, json_object *child, const char *key, int idx)
{
json_type objty;
if (NULL == owner) {
cli_dbgmsg("json: no owner object specified to cli_json_addowner\n");
return CL_ENULLARG;
}

if (NULL == child) {
cli_dbgmsg("json: no child object specified to cli_json_addowner\n");
return CL_ENULLARG;
}
objty = json_object_get_type(owner);

if (objty == json_type_object) {
if (NULL == key) {
cli_dbgmsg("json: null string specified as key to cli_addowner\n");
return CL_ENULLARG;
}
json_object_object_add(owner, key, child);
} else if (objty == json_type_array) {
if (idx < 0 || NULL == json_object_array_get_idx(owner, idx))
json_object_array_add(owner, child);
else if (0 != json_object_array_put_idx(owner, idx, child)) {
/* this shouldn't be possible */
cli_dbgmsg("json: cannot delete idx %d of owner array\n", idx);
return CL_BREAK;
}
} else {
cli_dbgmsg("json: no owner object cannot hold ownership\n");
return CL_EARG;
}

/* increment reference count */
json_object_get(child);
return CL_SUCCESS;
}

/* deleting an object DOES decrement reference count */
cl_error_t cli_json_delowner(json_object *owner, const char *key, int idx)
{
Expand Down
1 change: 0 additions & 1 deletion libclamav/json_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ cl_error_t cli_jsondouble(json_object *obj, const char *key, double d);
json_object *cli_jsonarray(json_object *obj, const char *key);
cl_error_t cli_jsonint_array(json_object *obj, int32_t val);
json_object *cli_jsonobj(json_object *obj, const char *key);
cl_error_t cli_json_addowner(json_object *owner, json_object *child, const char *key, int idx);
cl_error_t cli_json_delowner(json_object *owner, const char *key, int idx);
#define cli_json_delobj(obj) json_object_put(obj)

Expand Down
8 changes: 4 additions & 4 deletions libclamav/mbox.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4228,10 +4228,10 @@ do_multipart(message *mainMessage, message **messages, int i, mbox_status *rc, m
json_object *multiobj = cli_jsonarray(mctx->wrkobj, "Multipart");
if (multiobj == NULL) {
cli_errmsg("Cannot get multipart preclass array\n");
} else if (NULL == (thisobj = messageGetJObj(aMessage))) {
cli_dbgmsg("Cannot get message preclass object\n");
} else if (CL_SUCCESS != cli_json_addowner(multiobj, thisobj, NULL, -1)) {
cli_errmsg("Cannot assign message preclass object to multipart preclass array\n");
} else if (NULL == (thisobj = cli_jsonobj(NULL, NULL))) {
cli_dbgmsg("Cannot allocate new json object for message part.\n");
} else {
json_object_array_add(multiobj, thisobj);
}
}

Expand Down
15 changes: 0 additions & 15 deletions libclamav/message.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,6 @@ void messageReset(message *m)
free(m->encodingTypes);
}

if (m->jobj)
cli_json_delobj(m->jobj);

memset(m, '\0', sizeof(message));
m->mimeType = NOMIME;
}
Expand Down Expand Up @@ -2667,15 +2664,3 @@ int isuuencodebegin(const char *line)
isdigit(line[6]) && isdigit(line[7]) &&
isdigit(line[8]) && (line[9] == ' ');
}

json_object *messageGetJObj(message *m)
{
if (m == NULL) {
return NULL;
}

if (m->jobj == NULL)
m->jobj = cli_jsonobj(NULL, NULL);

return m->jobj;
}
3 changes: 0 additions & 3 deletions libclamav/message.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ typedef struct message {
char base64_1, base64_2, base64_3;
unsigned int isInfected : 1;
unsigned int isTruncated : 1;

json_object *jobj;
} message;

message *messageCreate(void);
Expand Down Expand Up @@ -87,6 +85,5 @@ int isuuencodebegin(const char *line);
void messageSetCTX(message *m, cli_ctx *ctx);
int messageContainsVirus(const message *m);
int messageSavePartial(message *m, const char *dir, const char *id, unsigned part);
json_object *messageGetJObj(message *m);

#endif /*_MESSAGE_H*/
Loading