RomandevJavaScript
diff --git a/‎docs/code-quality/c28213.md‎
Lines changed: 10 additions & 7 deletions b/‎docs/code-quality/c28213.md‎
Lines changed: 10 additions & 7 deletions
diff --git a/‎docs/code-quality/c6029.md‎
Lines changed: 3 additions & 3 deletions b/‎docs/code-quality/c6029.md‎
Lines changed: 3 additions & 3 deletions
@@ -28,39 +28,42 @@ The following code generates C28160. The `buffer` parameter annotation doesn't m
 *From example.h:*
 
 ```cpp
-void example_func(_Out_writes_(n) char* buffer, int n);
+void addNullTerminate(_Out_writes_(n) char* buffer, int n);
 ```
 
 *From example.cpp:*
 
 ```cpp
 _Use_decl_annotations_
-void example_func(_Out_writes_z_(n) char* buffer, int n)
+void addNullTerminate(_Out_writes_z_(n) char* buffer, int n)
 {
     buffer[n] = '\0';
 }
 ```
 
-To fix this issue, either change the annotations so they match at all locations, or after verifying the declaration annotations are correct, remove all annotations except `_Use_decl_annotations_` from the function definition. In this example, `_Out_writes_z_` appears to be correct, so we move that annotation to the function declaration in the header file. You can also remove all other annotations from the definition to simplify future maintenance, although this step is optional.
-
-In real world code, it's not usually as clear which annotation is correct. For more information and guidance, see [using SAL Annotations to reduce code defects](using-sal-annotations-to-reduce-c-cpp-code-defects.md).
+Examine the function definition to determine what the correct annotations should be. In this case, `_Out_writes_z_(n)` appears to be correct so we move that annotation to the function declaration in the header file. This resolves the issue because the annotations in the declaration and definition now match.
 
 *From example.h:*
 
 ```cpp
-void example_func(_Out_writes_z_(n) char* buffer, int n);
+void addNullTerminate(_Out_writes_z_(n) char* buffer, int n);
 ```
 
+The buffer annotation on the definition can now be removed to simplify future maintenance (although this step is optional).
+
 *From example.cpp:*
 
 ```cpp
 _Use_decl_annotations_
-void example_func(char* buffer, int n)
+void addNullTerminate(char* buffer, int n)
 {
     buffer[n] = '\0';
 }
 ```
 
+In real world code, it's not usually as clear which annotation is correct. For more information and guidance, see [using SAL Annotations to reduce code defects](using-sal-annotations-to-reduce-c-cpp-code-defects.md).
+
+
 ## See also
 
 [Rule sets for C++ code](./using-rule-sets-to-specify-the-cpp-rules-to-run.md)\
 
@@ -9,11 +9,11 @@ helpviewer_keywords: ["C6029"]
 
 > Possible buffer overrun in call to '*function*'
 
-Possible buffer overrun in function called due to an unchecked buffer length/size parameter.
+Possible buffer overrun in called function due to an unchecked buffer length/size parameter.
 
 ## Remarks
 
-This warning indicates a function that takes a buffer and a size is passed an unchecked size. The data read-in from some external source hasn't been verified to see whether it's smaller than the buffer size. An attacker might intentionally specify a far larger than expected value for the size, which can lead to a buffer overrun. Generally, whenever you read data from an untrusted external source, make sure to verify it for validity. It's appropriate to verify the size to make sure it's in the expected range.
+This warning indicates a function that takes a buffer and a size is passed an unchecked size. The data read-in from some external source hasn't been verified to see whether it's smaller than the buffer size. An attacker might intentionally specify a value far larger than expected for the size, which can lead to a buffer overrun. Generally, whenever you read data from an untrusted external source, make sure to verify it for validity. It's appropriate to verify the size to make sure it's in the expected range.
 
 Code analysis name: `USING_TAINTED_DATA`
 
@@ -79,7 +79,7 @@ void processDataMultiple(FILE* file)
     while( dataSize > 0 )
     {
         size_t readSize = dataSize > MAX_BUFFER_SIZE ? MAX_BUFFER_SIZE : dataSize;
-        fread(buffer, sizeof(uint32_t), readSize, file);
+        readSize = fread(buffer, sizeof(uint32_t), readSize, file);
         dataSize = dataSize - readSize;
         // Process the data in `buffer`...
     }