Fix event buffer size boundary check

project-chip · Feb 22, 2023 · 0893638 · 0893638
1 parent e04478c
commit 0893638
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/app/EventManagement.cpp b/src/app/EventManagement.cpp
@@ -170,14 +170,14 @@ CHIP_ERROR EventManagement::EnsureSpaceInCircularBuffer(size_t aRequiredSpace)
     ReclaimEventCtx ctx;
 
     // check whether we actually need to do anything, exit if we don't
-    VerifyOrExit(requiredSpace > eventBuffer->AvailableDataLength(), err = CHIP_NO_ERROR);
+    VerifyOrExit(requiredSpace >= eventBuffer->AvailableDataLength(), err = CHIP_NO_ERROR);
 
     while (true)
     {
         // check that the request can ultimately be satisfied.
         VerifyOrExit(requiredSpace <= eventBuffer->GetTotalDataLength(), err = CHIP_ERROR_BUFFER_TOO_SMALL);
 
-        if (requiredSpace > eventBuffer->AvailableDataLength())
+        if (requiredSpace >= eventBuffer->AvailableDataLength())
         {
             ctx.mpEventBuffer             = eventBuffer;
             ctx.mSpaceNeededForMovedEvent = 0;
@@ -194,7 +194,7 @@ CHIP_ERROR EventManagement::EnsureSpaceInCircularBuffer(size_t aRequiredSpace)
             {
                 VerifyOrExit(ctx.mSpaceNeededForMovedEvent != 0, /* no-op, return err */);
                 VerifyOrExit(eventBuffer->GetNextCircularEventBuffer() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
-                if (ctx.mSpaceNeededForMovedEvent <= eventBuffer->GetNextCircularEventBuffer()->AvailableDataLength())
+                if (ctx.mSpaceNeededForMovedEvent < eventBuffer->GetNextCircularEventBuffer()->AvailableDataLength())
                 {
                     // we can copy the event outright.  copy event and
                     // subsequently evict head s.t. evicting the head