Fixed the crash due to packet buffers running out of space in CommandHandlerImpl. (project-chip#35279)

shripad621git · tehampson · web-flow · commit 9c598998609c · 2024-08-29T17:14:06.000Z
* Fixed the crash due to packet buffers running out of space in CommandHandlerImpl

* Update src/app/CommandHandlerImpl.h

Co-authored-by: Terence Hampson &lt;thampson@google.com&gt;

---------

Co-authored-by: Terence Hampson &lt;thampson@google.com&gt;
diff --git a/src/app/CommandHandlerImpl.h b/src/app/CommandHandlerImpl.h
@@ -294,7 +294,12 @@ class CommandHandlerImpl : public CommandHandler
         {
             return CHIP_NO_ERROR;
         }
-        ReturnErrorOnFailure(RollbackResponse());
+        // The error value of RollbackResponse is not important if it fails, we prioritize
+        // conveying the error generated by addResponseFunction to the caller.
+        if (RollbackResponse() != CHIP_NO_ERROR)
+        {
+            return err;
+        }
         // If we failed to add a command due to lack of space in the
         // packet, we will make another attempt to add the response using
         // an additional InvokeResponseMessage.

Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,12 @@ class CommandHandlerImpl : public CommandHandler`
`294`	`294`	`{`
`295`	`295`	`return CHIP_NO_ERROR;`
`296`	`296`	`}`
`297`		`- ReturnErrorOnFailure(RollbackResponse());`
	`297`	`+ // The error value of RollbackResponse is not important if it fails, we prioritize`
	`298`	`+ // conveying the error generated by addResponseFunction to the caller.`
	`299`	`+ if (RollbackResponse() != CHIP_NO_ERROR)`
	`300`	`+ {`
	`301`	`+ return err;`
	`302`	`+ }`
`298`	`303`	`// If we failed to add a command due to lack of space in the`
`299`	`304`	`// packet, we will make another attempt to add the response using`
`300`	`305`	`// an additional InvokeResponseMessage.`