summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKaloian Manassiev <kaloian.manassiev@mongodb.com>2014-06-05 14:55:37 -0400
committerKaloian Manassiev <kaloian.manassiev@mongodb.com>2014-06-09 12:09:09 -0400
commit0974eb38fe72b31463d2e140013e89ac0eb45500 (patch)
tree298de35b14e22a0db78fbe20ce4f863182daf264 /src
parent7650ab7a985e23098270c8893320c5b151d16d7e (diff)
downloadmongo-0974eb38fe72b31463d2e140013e89ac0eb45500.tar.gz
SERVER-14178 Do NULL check before dereferencing
Diffstat (limited to 'src')
-rw-r--r--src/mongo/db/d_concurrency.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mongo/db/d_concurrency.cpp b/src/mongo/db/d_concurrency.cpp
index 77092d18d8c..07455ff9a43 100644
--- a/src/mongo/db/d_concurrency.cpp
+++ b/src/mongo/db/d_concurrency.cpp
@@ -278,9 +278,10 @@ namespace mongo {
fassert(16117, _lockState->threadState() != 0);
scopedLk = _lockState->leaveScopedLock();
+ fassert(16118, scopedLk);
+
invariant(_lockState == scopedLk->_lockState);
- fassert(16118, scopedLk);
scopedLk->tempRelease();
}
Lock::TempRelease::~TempRelease()