From 37f7a2c82d76fd5b9997686d8cbf1cf8a2180aac Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 10 Nov 2011 23:11:54 +0100 Subject: s3:locking:posix: remove uses of SMB_ASSERT() from get_windows_lock_ref_count() SMB_ASSERT is useless, since in non-developer build it does not actually fail after the log message, but usual flow just continues. Autobuild-User: Michael Adam Autobuild-Date: Fri Nov 25 14:59:53 CET 2011 on sn-devel-104 --- source3/locking/posix.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'source3/locking/posix.c') diff --git a/source3/locking/posix.c b/source3/locking/posix.c index 3a8b1635d8..0ff2395d60 100644 --- a/source3/locking/posix.c +++ b/source3/locking/posix.c @@ -517,9 +517,20 @@ static int get_windows_lock_ref_count(files_struct *fsp) goto done; } - SMB_ASSERT(NT_STATUS_IS_OK(status)); + if (!NT_STATUS_IS_OK(status)) { + DEBUG(0, ("get_windows_lock_ref_count: Error fetching " + "lock ref count for file %s: %s\n", + fsp_str_dbg(fsp), nt_errstr(status))); + goto done; + } - SMB_ASSERT(dbuf.dsize == sizeof(lock_ref_count)); + if (dbuf.dsize != sizeof(lock_ref_count)) { + DEBUG(0, ("get_windows_lock_ref_count: invalid entry " + "in lock ref count record for file %s: " + "(invalid data size %u)\n", + fsp_str_dbg(fsp), (unsigned int)dbuf.dsize)); + goto done; + } memcpy(&lock_ref_count, dbuf.dptr, sizeof(lock_ref_count)); TALLOC_FREE(dbuf.dptr); -- cgit