(mynewt-nimble) branch master updated: nimble/host: Refactor GATT Read Multiple Variable Char Value response

[janc]

This is an automated email from the ASF dual-hosted git repository.

sjanc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git


The following commit(s) were added to refs/heads/master by this push:
     new fae6a4874 nimble/host: Refactor GATT Read Multiple Variable Char Value 
response
fae6a4874 is described below

commit fae6a4874309ba0175d2c444e20f8a6bde007425
Author: Szymon Janc <szymon.j...@codecoup.pl>
AuthorDate: Tue May 12 09:37:17 2026 +0200

    nimble/host: Refactor GATT Read Multiple Variable Char Value response
    
    This reworks ATT_READ_MULTIPLE_VARIABLE_RSP parsing. If response
    doesn't match request (number of values requested) or LV parsing
    shows incorrect format we ignore that and report error to app.
---
 nimble/host/src/ble_gattc.c | 73 ++++++++++++++++++++++++++-------------------
 1 file changed, 43 insertions(+), 30 deletions(-)

diff --git a/nimble/host/src/ble_gattc.c b/nimble/host/src/ble_gattc.c
index 0418a405b..061c783e5 100644
--- a/nimble/host/src/ble_gattc.c
+++ b/nimble/host/src/ble_gattc.c
@@ -3361,49 +3361,62 @@ ble_gattc_read_mult_cb_var(struct ble_gattc_proc *proc, 
int status,
     for (i = 0; i < proc->read_mult.num_handles; i++) {
         attr[i].handle = proc->read_mult.handles[i];
         attr[i].offset = 0;
-        if (om == NULL || OS_MBUF_PKTLEN(*om) == 0) {
-            continue;
-        }
+    }
 
-        *om = os_mbuf_pullup(*om, 2);
-        assert(*om);
+    if (status == 0) {
+        for (i = 0; i < proc->read_mult.num_handles; i++) {
+            if (OS_MBUF_PKTLEN(*om) < 2) {
+                break;
+            }
 
-        attr_len = get_le16((*om)->om_data);
+            *om = os_mbuf_pullup(*om, 2);
+            if (*om == NULL) {
+                break;
+            }
 
-        os_mbuf_adj(*om, 2);
+            attr_len = get_le16((*om)->om_data);
+            os_mbuf_adj(*om, 2);
 
-        if (attr_len > BLE_ATT_ATTR_MAX_LEN) {
-            /*TODO Figure out what to do here */
-            break;
-        }
+            if (attr_len > BLE_ATT_ATTR_MAX_LEN) {
+                break;
+            }
 
-        attr[i].om = os_msys_get_pkthdr(attr_len, 0);
-        if (!attr[i].om) {
-            /*TODO Figure out what to do here */
-            break;
-        }
+            attr[i].om = os_msys_get_pkthdr(attr_len, 0);
+            if (!attr[i].om) {
+                /* this is OOM condition*/
+                status = BLE_HS_ENOMEM;
+                break;
+            }
 
-        rc = os_mbuf_appendfrom(attr[i].om, *om, 0, attr_len);
-        if (rc) {
-            /*TODO Figure out what to do here */
-            break;
+            rc = os_mbuf_appendfrom(attr[i].om, *om, 0, attr_len);
+            if (rc) {
+                break;
+            }
+
+            os_mbuf_adj(*om, attr_len);
         }
 
-        os_mbuf_adj(*om, attr_len);
-    }
+        /* failed to correctly parse response,
+         * cleanup any partial data and set status if not set already
+         */
+        if (i < proc->read_mult.num_handles || OS_MBUF_PKTLEN(*om) != 0) {
+            for (i = 0; i < proc->read_mult.num_handles; i++) {
+                os_mbuf_free_chain(attr[i].om);
+                attr[i].om = NULL;
+            }
 
-    /*FIXME Testing assert */
-    assert(i == proc->read_mult.num_handles);
+            if (status == 0) {
+                status = BLE_HS_EBADDATA;
+            }
+        }
+    }
 
     proc->read_mult.cb_mult(proc->conn_handle,
-                    ble_gattc_error(status, att_handle), &attr[0],
-                    i,
-                    proc->read_mult.cb_arg);
+                            ble_gattc_error(status, att_handle), &attr[0],
+                            proc->read_mult.num_handles, 
proc->read_mult.cb_arg);
 
     for (i = 0; i < proc->read_mult.num_handles; i++) {
-        if (attr[i].om != NULL) {
-            os_mbuf_free_chain(attr[i].om);
-        }
+        os_mbuf_free_chain(attr[i].om);
     }
 
     return 0;