Subtract don't add, avoid overflow

aspnet · Jan 20, 2017 · 7cfade2 · 7cfade2
1 parent bcac831
commit 7cfade2
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameHeaders.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameHeaders.cs
@@ -249,7 +249,7 @@ public static unsafe void ValidateHeaderCharacters(string headerCharacters)
                             {
                                 ThrowInvalidHeaderCharacter(pHeader + offset, Vector<byte>.Count);
                             }
-                        } while (offset + Vector<byte>.Count <= length);
+                        } while (offset <= length - Vector<byte>.Count);
                     }
 
                     // Non-vector testing:
@@ -258,7 +258,7 @@ public static unsafe void ValidateHeaderCharacters(string headerCharacters)
                     // Flag > 0x007f => All but highest bit picked up by 0x7f flagging, highest bit picked up by < 0x20 flagging
                     // Bitwise | or the above three together
                     // Bitwise & and each char with 0xff80; result should be 0 if all tests pass
-                    if (offset + sizeof(ulong) <= length)
+                    if (offset <= length - sizeof(ulong))
                     {
                         do
                         {
@@ -268,9 +268,9 @@ public static unsafe void ValidateHeaderCharacters(string headerCharacters)
                             {
                                 ThrowInvalidHeaderCharacter(pHeader + offset, sizeof(ulong));
                             }
-                        } while (offset + sizeof(ulong) <= length);
+                        } while (offset <= length - sizeof(ulong));
                     }
-                    if (offset + sizeof(uint) <= length)
+                    if (offset <= length - sizeof(uint))
                     {
                         var stringUint = (uint*)(pHeader + offset);
                         offset += sizeof(uint);
@@ -279,7 +279,7 @@ public static unsafe void ValidateHeaderCharacters(string headerCharacters)
                             ThrowInvalidHeaderCharacter(pHeader + offset, sizeof(uint));
                         }
                     }
-                    if (offset + sizeof(ushort) <= length)
+                    if (offset <= length - sizeof(ushort))
                     {
                         var stringUshort = (ushort*)(pHeader + offset);
                         offset += sizeof(ushort);