Merge pull request #5061 from MicrosoftDocs/main638551066469283099sync_temp

For protected branch, push strategy should use PR and merge to target branch method to work around git push error

Author: learn-build-service-prod[bot]

.whatsnew.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://whatsnewapi.azurewebsites.net/schema",
+  "$schema": "https://github.com/dotnet/docs-tools/blob/main/WhatsNew.Infrastructure/Configuration/reposettings.schema.json",
   "docSetProductName": "C++, C, and Assembler",
   "rootDirectory": "docs/",
   "docLinkSettings": {
@@ -10,7 +10,8 @@
     "minAdditionsToFile": 2,
     "pullRequestTitlesToIgnore": [
       "^Confirm merge from FromPublicMasterBranch",
-      "^Repo sync for protected CLA branch"
+      "^Repo sync for protected CLA branch",
+      "^Repo sync for protected branch"
     ],
     "omitPullRequestTitles": false
   },

docs/code-quality/c26430.md

@@ -27,8 +27,6 @@ A variable is marked as checked for null when it's used in the following context
 - in non-bitwise logical operations;
 - in comparison operations where one operand is a constant expression that evaluates to zero.
 
-The rule doesn't have full data flow tracking. It can produce incorrect results in cases where indirect checks are used (such as when an intermediate variable holds a null value and is later used in a comparison).
-
 Implicit null checks are assumed when a pointer value is assigned from:
 
 - an allocation performed with throwing `operator new`;
@@ -67,3 +65,36 @@ void merge_states(gsl::not_null<const state *> left, gsl::not_null<const state *
     }
 }
 ```
+
+## Heuristics
+
+When ensuring that a dereference of a pointer isn't null, this rule doesn't require *every* dereference to have a prior null check. Instead, it requires a null check before *first* dereference of the pointer. The following function doesn't trigger C26430:
+
+```cpp
+void f(int* p)
+{
+    if (p)
+        *p = 1;
+    *p = 2;
+}
+```
+
+The following function generates C26430 because there's a path to assign `*p` without a null check:
+
+```cpp
+void f(bool b, int* p)
+{
+    if (b && p)
+        *p = 1;
+    *p = 2;
+}
+```
+
+Rules [C26822](c26822.md) and [C26823](c26823.md) apply to dereferencing a (possibly) null pointer.  
+
+This rule doesn't do full data flow tracking. It can produce incorrect results in cases where indirect checks are used, such as when an intermediate variable holds a null value and is later used in a comparison.
+
+## See also
+
+[C26822](c26822.md)\
+[C26823](c26823.md)

docs/error-messages/compiler-errors-1/compiler-error-c2217.md

@@ -12,15 +12,9 @@ ms.assetid: 1ce1e3f5-4171-4376-804d-967f7e612935
 
 The first function attribute requires the second attribute.
 
-### To fix by checking the following possible causes
-
-1. Interrupt (`__interrupt`) function declared as `near`. Interrupt functions must be `far`.
-
-1. Interrupt function declared with **`__stdcall`**, or **`__fastcall`**. Interrupt functions must use C calling conventions.
-
 ## Example
 
-C2217 can also occur if you attempt to bind a delegate to a CLR function that takes a variable number of arguments. If the function also has e param array overload, use that instead. The following sample generates C2217.
+C2217 can occur if you attempt to bind a delegate to a CLR function that takes a variable number of arguments. If the function also has a param array overload, use that instead. The following sample generates C2217.
 
 ```cpp
 // C2217.cpp