diff options
| author | Jeremy Allison <jeremy@jeremy-desktop.(none)> | 2008-12-23 12:11:12 -0800 |
|---|---|---|
| committer | Jeremy Allison <jeremy@jeremy-desktop.(none)> | 2008-12-23 12:11:12 -0800 |
| commit | d0eeb9aa8db42ed1fc18024614560820354e6dfa (patch) | |
| tree | 4b981ba4aa23fe1a9d53139a135018cbbd5871b5 /source3/smbd | |
| parent | 1966a947d3f8d432d3af5a9c0004e27561ae7f65 (diff) | |
| download | samba-d0eeb9aa8db42ed1fc18024614560820354e6dfa.tar.gz samba-d0eeb9aa8db42ed1fc18024614560820354e6dfa.tar.bz2 samba-d0eeb9aa8db42ed1fc18024614560820354e6dfa.zip | |
Fix more asprintf warnings and some error path errors.
Jeremy.
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/fileio.c | 9 | ||||
| -rw-r--r-- | source3/smbd/seal.c | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c index 60aeeef1e2..e67f926a04 100644 --- a/source3/smbd/fileio.c +++ b/source3/smbd/fileio.c @@ -867,11 +867,14 @@ void set_filelen_write_cache(files_struct *fsp, SMB_OFF_T file_size) /* The cache *must* have been flushed before we do this. */ if (fsp->wcp->data_size != 0) { char *msg; - asprintf(&msg, "set_filelen_write_cache: size change " + if (asprintf(&msg, "set_filelen_write_cache: size change " "on file %s with write cache size = %lu\n", fsp->fsp_name, - (unsigned long)fsp->wcp->data_size); - smb_panic(msg); + (unsigned long)fsp->wcp->data_size) != -1) { + smb_panic(msg); + } else { + smb_panic("set_filelen_write_cache"); + } } fsp->wcp->file_size = file_size; } diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c index 3822ee191e..bd4d853885 100644 --- a/source3/smbd/seal.c +++ b/source3/smbd/seal.c @@ -128,8 +128,7 @@ static NTSTATUS get_srv_gss_creds(const char *service, gss_OID_desc nt_hostbased_service = {10, CONST_DISCARD(char *,"\x2a\x86\x48\x86\xf7\x12\x01\x02\x01\x04")}; - asprintf(&host_princ_s, "%s@%s", service, name); - if (host_princ_s == NULL) { + if (asprintf(&host_princ_s, "%s@%s", service, name) == -1) { return NT_STATUS_NO_MEMORY; } |