CPP: Guard the delete.

geoffw0 · geoffw0 · commit 34fbc7b194dd · 2019-04-05T10:00:55.000+01:00
diff --git a/cpp/ql/test/examples/BadLocking/AV Rule 107.expected b/cpp/ql/test/examples/BadLocking/AV Rule 107.expected
@@ -1,2 +1,2 @@
-| UnintendedDeclaration.cpp:48:2:48:22 | declaration | Functions should be declared at file scope, not inside blocks. |
-| UnintendedDeclaration.cpp:69:2:69:27 | declaration | Functions should be declared at file scope, not inside blocks. |
+| UnintendedDeclaration.cpp:51:2:51:22 | declaration | Functions should be declared at file scope, not inside blocks. |
+| UnintendedDeclaration.cpp:72:2:72:27 | declaration | Functions should be declared at file scope, not inside blocks. |
diff --git a/cpp/ql/test/examples/BadLocking/DeclStmts.expected b/cpp/ql/test/examples/BadLocking/DeclStmts.expected
@@ -1,7 +1,7 @@
-| UnintendedDeclaration.cpp:41:2:41:29 | declaration | myLock | Variable |
-| UnintendedDeclaration.cpp:48:2:48:22 | declaration | myLock | Function |
-| UnintendedDeclaration.cpp:55:2:55:20 | declaration | myLock | Variable |
-| UnintendedDeclaration.cpp:62:2:62:22 | declaration | myMutex | Variable |
-| UnintendedDeclaration.cpp:69:2:69:27 | declaration | myLock | Function |
-| UnintendedDeclaration.cpp:79:3:79:34 | declaration | myLock | Variable |
-| UnintendedDeclaration.cpp:86:3:86:27 | declaration | memberMutex | Variable |
+| UnintendedDeclaration.cpp:44:2:44:29 | declaration | myLock | Variable |
+| UnintendedDeclaration.cpp:51:2:51:22 | declaration | myLock | Function |
+| UnintendedDeclaration.cpp:58:2:58:20 | declaration | myLock | Variable |
+| UnintendedDeclaration.cpp:65:2:65:22 | declaration | myMutex | Variable |
+| UnintendedDeclaration.cpp:72:2:72:27 | declaration | myLock | Function |
+| UnintendedDeclaration.cpp:82:3:82:34 | declaration | myLock | Variable |
+| UnintendedDeclaration.cpp:89:3:89:27 | declaration | memberMutex | Variable |
diff --git a/cpp/ql/test/examples/BadLocking/LocalVariableHidesGlobalVariable.expected b/cpp/ql/test/examples/BadLocking/LocalVariableHidesGlobalVariable.expected
@@ -1 +1 @@
-| UnintendedDeclaration.cpp:62:14:62:20 | definition of myMutex | Local variable myMutex hides $@ with the same name. | UnintendedDeclaration.cpp:37:7:37:13 | myMutex | a global variable |
+| UnintendedDeclaration.cpp:65:14:65:20 | definition of myMutex | Local variable myMutex hides $@ with the same name. | UnintendedDeclaration.cpp:40:7:40:13 | myMutex | a global variable |
diff --git a/cpp/ql/test/examples/BadLocking/UnintendedDeclaration.cpp b/cpp/ql/test/examples/BadLocking/UnintendedDeclaration.cpp
@@ -27,7 +27,10 @@ class Lock
 
 	~Lock()
 	{
-		m->unlock();
+		if (m)
+		{
+			m->unlock();
+		}
 	}
 
 private:

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-\| UnintendedDeclaration.cpp:62:14:62:20 \| definition of myMutex \| Local variable myMutex hides $@ with the same name. \| UnintendedDeclaration.cpp:37:7:37:13 \| myMutex \| a global variable \|`
	`1`	`+\| UnintendedDeclaration.cpp:65:14:65:20 \| definition of myMutex \| Local variable myMutex hides $@ with the same name. \| UnintendedDeclaration.cpp:40:7:40:13 \| myMutex \| a global variable \|`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,10 @@ class Lock`
`27`	`27`
`28`	`28`	`~Lock()`
`29`	`29`	`{`
`30`		`- m->unlock();`
	`30`	`+ if (m)`
	`31`	`+ {`
	`32`	`+ m->unlock();`
	`33`	`+ }`
`31`	`34`	`}`
`32`	`35`
`33`	`36`	`private:`