diff options
| author | Eric Caruso <ejcaruso@chromium.org> | 2023-03-15 11:09:41 -0400 |
|---|---|---|
| committer | Eric Caruso <ejcaruso@chromium.org> | 2023-03-15 11:58:39 -0400 |
| commit | f0b758a56875867497908b497c92aca9674ed15d (patch) | |
| tree | 58bab4bbd1b8216f11f471d188b3c192970a6f72 | |
| parent | 946b029838d3b82b7ed81eb952b957395e6ac6f8 (diff) | |
| download | libqmi-f0b758a56875867497908b497c92aca9674ed15d.tar.gz | |
qmi-endpoint-qrtr: return early on failure
This avoids a circumstance where we could fail to parse information
out of the message, but still try to use the uninitialized values
later as all we did in response was set the to-be-returned result
and continue processing.
| -rw-r--r-- | src/libqmi-glib/qmi-endpoint-qrtr.c | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/src/libqmi-glib/qmi-endpoint-qrtr.c b/src/libqmi-glib/qmi-endpoint-qrtr.c index a02cab8e..8c4007a1 100644 --- a/src/libqmi-glib/qmi-endpoint-qrtr.c +++ b/src/libqmi-glib/qmi-endpoint-qrtr.c @@ -284,7 +284,6 @@ handle_alloc_cid (QmiEndpointQrtr *self, gsize init_offset; guint8 service; guint cid; - QmiProtocolError result = QMI_PROTOCOL_ERROR_NONE; g_autoptr(QmiMessage) response = NULL; g_autoptr(GError) error = NULL; @@ -292,21 +291,31 @@ handle_alloc_cid (QmiEndpointQrtr *self, !qmi_message_tlv_read_guint8 (message, init_offset, &offset, &service, &error)) { g_debug ("[%s] error allocating CID: could not parse message: %s", qmi_endpoint_get_name (QMI_ENDPOINT (self)), error->message); - result = QMI_PROTOCOL_ERROR_MALFORMED_MESSAGE; + response = qmi_message_response_new (message, QMI_PROTOCOL_ERROR_MALFORMED_MESSAGE); + if (!response) + return; + + add_qmi_message_to_buffer (self, g_steal_pointer (&response)); + return; } cid = allocate_client (self, service, &error); if (!cid) { g_debug ("[%s] error allocating CID: %s", qmi_endpoint_get_name (QMI_ENDPOINT (self)), error->message); - result = QMI_PROTOCOL_ERROR_INTERNAL; + response = qmi_message_response_new (message, QMI_PROTOCOL_ERROR_INTERNAL); + if (!response) + return; + + add_qmi_message_to_buffer (self, g_steal_pointer (&response)); + return; } - response = qmi_message_response_new (message, result); + response = qmi_message_response_new (message, QMI_PROTOCOL_ERROR_NONE); if (!response) return; - if ((result == QMI_PROTOCOL_ERROR_NONE) && !construct_alloc_tlv (response, service, cid)) + if (!construct_alloc_tlv (response, service, cid)) return; add_qmi_message_to_buffer (self, g_steal_pointer (&response)); @@ -319,8 +328,7 @@ handle_release_cid (QmiEndpointQrtr *self, gsize offset = 0; gsize init_offset; guint8 service; - guint8 cid = 0; - QmiProtocolError result = QMI_PROTOCOL_ERROR_NONE; + guint8 cid; g_autoptr(QmiMessage) response = NULL; g_autoptr(GError) error = NULL; @@ -329,16 +337,21 @@ handle_release_cid (QmiEndpointQrtr *self, !qmi_message_tlv_read_guint8 (message, init_offset, &offset, &cid, &error)) { g_debug ("[%s] error releasing CID: could not parse message: %s", qmi_endpoint_get_name (QMI_ENDPOINT (self)), error->message); - result = QMI_PROTOCOL_ERROR_MALFORMED_MESSAGE; + response = qmi_message_response_new (message, QMI_PROTOCOL_ERROR_MALFORMED_MESSAGE); + if (!response) + return; + + add_qmi_message_to_buffer (self, g_steal_pointer (&response)); + return; } release_client (self, service, cid); - response = qmi_message_response_new (message, result); + response = qmi_message_response_new (message, QMI_PROTOCOL_ERROR_NONE); if (!response) return; - if ((result == QMI_PROTOCOL_ERROR_NONE) && !construct_alloc_tlv (response, service, cid)) + if (!construct_alloc_tlv (response, service, cid)) return; add_qmi_message_to_buffer (self, g_steal_pointer (&response)); |