Fixes null-dereference in mail message parser.

pull/118/head
Micah Snyder (micasnyd) 6 years ago
parent 069ab18eec
commit 67b5bb6cd4
  1. 2
      libclamav/mbox.c
  2. 4
      libclamav/message.c

@ -4246,7 +4246,7 @@ do_multipart(message *mainMessage, message **messages, int i, mbox_status *rc, m
thisobj = messageGetJObj(aMessage);
if (thisobj == NULL) {
cli_errmsg("Cannot get message preclass object\n");
cli_dbgmsg("Cannot get message preclass object\n");
*rc = -1;
return mainMessage;
}

@ -2632,7 +2632,9 @@ int isuuencodebegin(const char *line)
#if HAVE_JSON
json_object *messageGetJObj(message *m)
{
assert(m != NULL);
if (m == NULL) {
return NULL;
}
if (m->jobj == NULL)
m->jobj = cli_jsonobj(NULL, NULL);

Loading…
Cancel
Save