[INCLUDE] Safely handle odd & large lengths in ProbeAndCaptureUnicodeString.

2026-08-27 03:43:36 +00:00 · 2019-12-29 15:22:10 +01:00
parent 975e117780
commit 0d26bbf4b5
1 changed files with 12 additions and 1 deletions
@@ -180,7 +180,18 @@ ProbeAndCaptureUnicodeString(OUT PUNICODE_STRING Dest,

                    /* Set it as the buffer */
                    Dest->Buffer = Buffer;
-                    Dest->MaximumLength = Dest->Length + sizeof(WCHAR);
+                    if (Dest->Length % sizeof(WCHAR))
+                    {
+                        Dest->Length--;
+                    }
+                    if (Dest->Length >= UNICODE_STRING_MAX_BYTES)
+                    {
+                        Dest->MaximumLength = Dest->Length;
+                    }
+                    else
+                    {
+                        Dest->MaximumLength = Dest->Length + sizeof(WCHAR);
+                    }
                }
                else
                {