[v1.3-branch] : Fixed the crash due to packet buffers running out of space in CommandHandlerImpl (#35308)

shripad621git · web-flow · commit 38ede4293096 · 2024-09-03T10:42:39.000-04:00
diff --git a/src/app/CommandHandler.h b/src/app/CommandHandler.h
@@ -327,7 +327,12 @@ class 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
`@@ -327,7 +327,12 @@ class CommandHandler`
`327`	`327`	`{`
`328`	`328`	`return CHIP_NO_ERROR;`
`329`	`329`	`}`
`330`		`- ReturnErrorOnFailure(RollbackResponse());`
	`330`	`+ // The error value of RollbackResponse is not important if it fails, we prioritize`
	`331`	`+ // conveying the error generated by addResponseFunction to the caller.`
	`332`	`+ if (RollbackResponse() != CHIP_NO_ERROR)`
	`333`	`+ {`
	`334`	`+ return err;`
	`335`	`+ }`
`331`	`336`	`// If we failed to add a command due to lack of space in the`
`332`	`337`	`// packet, we will make another attempt to add the response using`
`333`	`338`	`// an additional InvokeResponseMessage.`