turns out, free(NULL) is just fine ...

This commit is contained in:
Oswald Buddenhagen 2010-11-14 16:44:50 +01:00
parent e1fa867423
commit d637772339
3 changed files with 8 additions and 16 deletions

View File

@ -164,7 +164,6 @@ convert( config_t *box )
if (!(d = opendir( buf ))) { if (!(d = opendir( buf ))) {
perror( "opendir" ); perror( "opendir" );
err4: err4:
if (msgs)
free( msgs ); free( msgs );
if (db) if (db)
db->close( db, 0 ); db->close( db, 0 );
@ -252,7 +251,6 @@ convert( config_t *box )
close( fd ); close( fd );
unlink( ilname ); unlink( ilname );
if (msgs)
free( msgs ); free( msgs );
free( mboxdir ); free( mboxdir );
return; return;

View File

@ -520,7 +520,6 @@ v_submit_imap_cmd( imap_store_t *ctx, struct imap_cmd *cmd,
printf( ">>> %d LOGIN <user> <pass>\n", cmd->tag ); printf( ">>> %d LOGIN <user> <pass>\n", cmd->tag );
} }
if (socket_write( &ctx->buf.sock, buf, bufl ) != bufl) { if (socket_write( &ctx->buf.sock, buf, bufl ) != bufl) {
if (cmd->param.data)
free( cmd->param.data ); free( cmd->param.data );
free( cmd->cmd ); free( cmd->cmd );
free( cmd ); free( cmd );
@ -1115,7 +1114,6 @@ get_cmd_result( imap_store_t *ctx, struct imap_cmd *tcmd )
normal: normal:
if (cmdp->param.done) if (cmdp->param.done)
cmdp->param.done( ctx, cmdp, resp ); cmdp->param.done( ctx, cmdp, resp );
if (cmdp->param.data)
free( cmdp->param.data ); free( cmdp->param.data );
free( cmdp->cmd ); free( cmdp->cmd );
free( cmdp ); free( cmdp );
@ -1590,7 +1588,6 @@ imap_select( store_t *gctx, int minuid, int maxuid, int *excs, int nexcs,
ret = DRV_OK; ret = DRV_OK;
bail: bail:
if (excs)
free( excs ); free( excs );
return cb( ret, aux ); return cb( ret, aux );
} }

View File

@ -133,9 +133,7 @@ maildir_cleanup( store_t *gctx )
if (ctx->db) if (ctx->db)
ctx->db->close( ctx->db, 0 ); ctx->db->close( ctx->db, 0 );
#endif /* USE_DB */ #endif /* USE_DB */
if (gctx->path)
free( gctx->path ); free( gctx->path );
if (ctx->excs)
free( ctx->excs ); free( ctx->excs );
if (ctx->uvfd >= 0) if (ctx->uvfd >= 0)
close( ctx->uvfd ); close( ctx->uvfd );
@ -214,7 +212,6 @@ maildir_free_scan( msglist_t *msglist )
if (msglist->ents) { if (msglist->ents) {
for (i = 0; i < msglist->nents; i++) for (i = 0; i < msglist->nents; i++)
if (msglist->ents[i].base)
free( msglist->ents[i].base ); free( msglist->ents[i].base );
free( msglist->ents ); free( msglist->ents );
} }