summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2006-08-25 18:24:43 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:38:52 -0500
commit9230c659f66df3da9fda5e7cae1717f19c9c08c7 (patch)
treef238a3aa901ba6fd7cfcfc7fee87077d10966f58
parent6365dcef4d753b11a33ae4311a09a4c475f566aa (diff)
downloadsamba-9230c659f66df3da9fda5e7cae1717f19c9c08c7.tar.gz
samba-9230c659f66df3da9fda5e7cae1717f19c9c08c7.tar.bz2
samba-9230c659f66df3da9fda5e7cae1717f19c9c08c7.zip
r17835: Fix Coverity bugs 306, 309, 310.
Jeremy, you might want to look at the trans2 one. Volker (This used to be commit d727fc681c073a1b09accd31a07341b58e10eebb)
-rw-r--r--source3/libaddns/dnssock.c2
-rw-r--r--source3/libaddns/dnsupdate.c5
-rw-r--r--source3/smbd/trans2.c2
3 files changed, 2 insertions, 7 deletions
diff --git a/source3/libaddns/dnssock.c b/source3/libaddns/dnssock.c
index 3d0991a1aa..d3223b9bd8 100644
--- a/source3/libaddns/dnssock.c
+++ b/source3/libaddns/dnssock.c
@@ -732,7 +732,7 @@ void DNSFreeSendBufferContext( HANDLE hSendBuffer )
pSendBufferContext = ( DNS_SENDBUFFER_CONTEXT * ) hSendBuffer;
- if ( pSendBufferContext->pSendBuffer ) {
+ if ( pSendBufferContext && pSendBufferContext->pSendBuffer ) {
DNSFreeMemory( pSendBufferContext->pSendBuffer );
}
if ( pSendBufferContext ) {
diff --git a/source3/libaddns/dnsupdate.c b/source3/libaddns/dnsupdate.c
index 36c5cbb13a..503316d305 100644
--- a/source3/libaddns/dnsupdate.c
+++ b/source3/libaddns/dnsupdate.c
@@ -431,7 +431,6 @@ int32 DNSUpdateGenerateSignature( gss_ctx_id_t * pGSSContext,
{
int32 dwError = 0;
int32 dwMinorStatus = 0;
- HANDLE hSendBuffer = ( HANDLE ) NULL;
uint8 *pMessageBuffer = NULL;
int32 dwMessageSize = 0;
int32 dwMaxSignatureSize = 0;
@@ -477,10 +476,6 @@ int32 DNSUpdateGenerateSignature( gss_ctx_id_t * pGSSContext,
error:
- if ( hSendBuffer ) {
- DNSFreeSendBufferContext( hSendBuffer );
- }
-
if ( pMessageBuffer ) {
DNSFreeMemory( pMessageBuffer );
}
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 87bfa18dcf..f40dd5154b 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -3085,7 +3085,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
files_struct *fsp1 = file_find_di_first(sbuf.st_dev, sbuf.st_ino);
if (fsp1 && fsp1->pending_modtime) {
/* the pending modtime overrides the current modtime */
- mtime_ts.tv_sec = fsp->pending_modtime;
+ mtime_ts.tv_sec = fsp1->pending_modtime;
mtime_ts.tv_nsec = 0;
}
if (fsp1 && fsp1->initial_allocation_size) {