dtmail: resolve 'deference before null check' errors related to if(!NULL) checks around free() calls

This commit is contained in:
Peter Howkins
2018-04-02 20:29:28 +01:00
parent 8362f92ceb
commit 0b38496bd8
27 changed files with 41 additions and 68 deletions

View File

@@ -1597,8 +1597,7 @@ DtMail::Session::targetTagName(char *special)
NULL,
&ret_codeset);
if (ret_locale)
free(ret_locale);
free(ret_locale);
if (ret_lang)
free(ret_lang);
if (ret_target)

View File

@@ -382,8 +382,7 @@ MIMEBodyPart::getDtType(DtMailEnv & error)
error.clear();
if (type)
DtDtsFreeDataType(type);
if (mime_type)
free(mime_type);
free(mime_type);
if (name)
free(name);
}
@@ -510,7 +509,6 @@ MIMEBodyPart::loadBody(DtMailEnv & error)
}
}
}
if ( cs )
free ( cs );
if ( from_cs )
free( from_cs );

View File

@@ -4963,7 +4963,7 @@ RFCMailBox::createMailRetrievalAgent(char *password)
appendCB, (void*) this);
if (NULL != _mra_server) _mra_server->set_password(_mra_serverpw);
if (NULL != protocol) free(protocol);
free(protocol);
}
else if (True == DtMailServer::get_mailrc_value(
_session, DTMAS_INBOX,

View File

@@ -170,8 +170,7 @@ decode1522(const char * enc_start, const char * max_end, char **output, DtMail::
free( from_cs );
if (NULL != to_cs)
free ( to_cs );
if (NULL != cs_name)
free(cs_name);
free(cs_name);
return(enc_end);
}

View File

@@ -375,14 +375,12 @@ SunV3::formatBodies(DtMailEnv & error,
delete [] cbuf;
delete rd;
}
if (bp_contents) {
free(bp_contents);
bp_contents = NULL;
}
if (name) {
free(name);
name = NULL;
}
free(bp_contents);
bp_contents = NULL;
free(name);
name = NULL;
}
}

View File

@@ -590,8 +590,7 @@ V3BodyPart::loadBody(DtMailEnv &)
strcpy(cs, "DEFAULT");
strcat(cs, ".");
strcat(cs, ret);
if ( ret )
free( ret );
free( ret );
}
} // If cstmp is NULL