From d6d27df27b87303059f7269fd890af7c467f37ad Mon Sep 17 00:00:00 2001
From: Raul Garcia <raulga@microsoft.com>
Date: Tue, 25 Sep 2018 10:50:34 -0700
Subject: [PATCH] Removing all usage of single quotes

---
 .../CWE/CWE-732/UnsafeDaclSecurityDescriptor.qhelp        | 2 +-
 .../Security/CWE/CWE-732/UnsafeDaclSecurityDescriptor.ql  | 8 ++++----
 .../CWE/CWE-732/UnsafeDaclSecurityDescriptor.expected     | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cpp/ql/src/Security/CWE/CWE-732/UnsafeDaclSecurityDescriptor.qhelp b/cpp/ql/src/Security/CWE/CWE-732/UnsafeDaclSecurityDescriptor.qhelp
index 79e2285201a..519d21fd8c1 100644
--- a/cpp/ql/src/Security/CWE/CWE-732/UnsafeDaclSecurityDescriptor.qhelp
+++ b/cpp/ql/src/Security/CWE/CWE-732/UnsafeDaclSecurityDescriptor.qhelp
@@ -4,7 +4,7 @@
 <qhelp>
 
 <overview>
-  <p>This query indicates that a call is setting the <code>SECURITY_DESCRIPTOR</code>'s DACL field to null.</p>
+  <p>This query indicates that a call is setting the DACL field in a <code>SECURITY_DESCRIPTOR</code> to null.</p>
   <p>When using <code>SetSecurityDescriptorDacl</code> to set a discretionary access control (DACL), setting the <code>bDaclPresent</code> argument to <code>TRUE</code> indicates the prescence of a DACL in the security description in the argument <code>pDacl</code>.</p>
   <p>When the <code>pDacl</code> parameter does not point to a DACL (i.e. it is <code>NULL</code>) and the <code>bDaclPresent</code> flag is <code>TRUE</code>, a <code>NULL DACL</code> is specified.</p>
   <p>A <code>NULL DACL</code> grants full access to any user who requests it; normal security checking is not performed with respect to the object.</p>
diff --git a/cpp/ql/src/Security/CWE/CWE-732/UnsafeDaclSecurityDescriptor.ql b/cpp/ql/src/Security/CWE/CWE-732/UnsafeDaclSecurityDescriptor.ql
index d2165187b42..068c4e44289 100644
--- a/cpp/ql/src/Security/CWE/CWE-732/UnsafeDaclSecurityDescriptor.ql
+++ b/cpp/ql/src/Security/CWE/CWE-732/UnsafeDaclSecurityDescriptor.ql
@@ -1,6 +1,6 @@
 /**
- * @name Setting a SECURITY_DESCRIPTOR's DACL to NULL
- * @description Setting a SECURITY_DESCRIPTOR's DACL to NULL will result in an unprotected object.
+ * @name Setting a DACL to NULL in a SECURITY_DESCRIPTOR
+ * @description Setting a DACL to NULL in a SECURITY_DESCRIPTOR will result in an unprotected object.
  *              If the DACL that belongs to the security descriptor of an object is set to NULL, a null DACL is created. 
  *              A null DACL grants full access to any user who requests it;
  *              normal security checking is not performed with respect to the object.
@@ -53,14 +53,14 @@ from SetSecurityDescriptorDaclFunctionCall call, string message
 where exists
   ( 
     NullValue nullExpr |
-    message = "Setting a SECURITY_DESCRIPTOR's DACL to NULL will result in an unprotected object." |
+    message = "Setting a DACL to NULL in a SECURITY_DESCRIPTOR will result in an unprotected object." |
     call.getArgument(1).getValue().toInt() != 0
     and call.getArgument(2) = nullExpr
   ) or exists
   ( 
     Expr constassign, VariableAccess var, 
     SetSecurityDescriptorDaclFunctionConfiguration config |
-    message = "Setting a SECURITY_DESCRIPTOR's DACL using variable " + var + " that is set to NULL will result in an unprotected object." |
+    message = "Setting a DACL to NULL in a SECURITY_DESCRIPTOR using variable " + var + " that is set to NULL will result in an unprotected object." |
     var = call.getArgument(2)
     and config.hasFlow(DataFlow::exprNode(constassign), DataFlow::exprNode(var))
   )
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-732/UnsafeDaclSecurityDescriptor.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-732/UnsafeDaclSecurityDescriptor.expected
index 41b2e91da4c..e596bae3a0f 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-732/UnsafeDaclSecurityDescriptor.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-732/UnsafeDaclSecurityDescriptor.expected
@@ -1,2 +1,2 @@
-| UnsafeDaclSecurityDescriptor.cpp:70:9:70:33 | call to SetSecurityDescriptorDacl | Setting a SECURITY_DESCRIPTOR\u2019s DACL to NULL will result in an unprotected object. |
-| UnsafeDaclSecurityDescriptor.cpp:76:9:76:33 | call to SetSecurityDescriptorDacl | Setting a SECURITY_DESCRIPTOR\u2019s DACL using variable pDacl that is set to NULL will result in an unprotected object. |
+| UnsafeDaclSecurityDescriptor.cpp:70:9:70:33 | call to SetSecurityDescriptorDacl | Setting a DACL to NULL in a SECURITY_DESCRIPTOR will result in an unprotected object. |
+| UnsafeDaclSecurityDescriptor.cpp:76:9:76:33 | call to SetSecurityDescriptorDacl | Setting a DACL to NULL in a SECURITY_DESCRIPTOR using variable pDacl that is set to NULL will result in an unprotected object. |