diff options
| author | Simo Sorce <idra@samba.org> | 2001-09-17 11:25:41 +0000 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2001-09-17 11:25:41 +0000 |
| commit | 61b2794968faa35dc91edce17e9b91e5366c3514 (patch) | |
| tree | 3fd9ec24adcdf149263066754f5e51ac7a4e14e0 /source3/smbd/nttrans.c | |
| parent | 87945989c0383bd012be7ab8bc5920b6d03fa105 (diff) | |
| download | samba-61b2794968faa35dc91edce17e9b91e5366c3514.tar.gz samba-61b2794968faa35dc91edce17e9b91e5366c3514.tar.bz2 samba-61b2794968faa35dc91edce17e9b91e5366c3514.zip | |
move to SAFE_FREE()
(This used to be commit a95943fde0ad89ae3f2deca2f7ba9cb5ab612b74)
Diffstat (limited to 'source3/smbd/nttrans.c')
| -rw-r--r-- | source3/smbd/nttrans.c | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c index ca1efd0221..c072a38474 100644 --- a/source3/smbd/nttrans.c +++ b/source3/smbd/nttrans.c @@ -1693,9 +1693,9 @@ due to being in oplock break state.\n" )); if ((total_parameter_count && !params) || (total_data_count && !data) || (setup_count && !setup)) { - safe_free(setup); - safe_free(params); - safe_free(data); + SAFE_FREE(setup); + SAFE_FREE(params); + SAFE_FREE(data); DEBUG(0,("reply_nttrans : Out of memory\n")); END_PROFILE(SMBnttrans); return ERROR_DOS(ERRDOS,ERRnomem); @@ -1745,12 +1745,9 @@ due to being in oplock break state.\n" )); DEBUG(0,("reply_nttrans: %s in getting secondary nttrans response.\n", (smb_read_error == READ_ERROR) ? "error" : "timeout" )); } - if(params) - free(params); - if(data) - free(data); - if(setup) - free(setup); + SAFE_FREE(params); + SAFE_FREE(data); + SAFE_FREE(setup); END_PROFILE(SMBnttrans); return ERROR_DOS(ERRSRV,ERRerror); } @@ -1821,12 +1818,9 @@ due to being in oplock break state.\n" )); default: /* Error in request */ DEBUG(0,("reply_nttrans: Unknown request %d in nttrans call\n", function_code)); - if(setup) - free(setup); - if(params) - free(params); - if(data) - free(data); + SAFE_FREE(setup); + SAFE_FREE(params); + SAFE_FREE(data); END_PROFILE(SMBnttrans); return ERROR_DOS(ERRSRV,ERRerror); } @@ -1838,12 +1832,9 @@ due to being in oplock break state.\n" )); an error packet. */ - if(setup) - free(setup); - if(params) - free(params); - if(data) - free(data); + SAFE_FREE(setup); + SAFE_FREE(params); + SAFE_FREE(data); END_PROFILE(SMBnttrans); return outsize; /* If a correct response was needed the call_nt_transact_xxxx calls have already sent it. If outsize != -1 then it is |