json: Fix 64-bit support

This patch fixes encoding arrays of objects on 64-bit targets. Fixes #36696 Signed-off-by: Markus Fuchs <[email protected]>
zephyrproject-rtos · Jun 29, 2023 · 8757c71 · 8757c71
1 parent b311c53
commit 8757c71
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/lib/os/json.c b/lib/os/json.c
@@ -535,12 +535,10 @@ static ptrdiff_t get_elem_size(const struct json_obj_descr *descr)
 		size_t i;
 
 		for (i = 0; i < descr->object.sub_descr_len; i++) {
-			ptrdiff_t s = get_elem_size(&descr->object.sub_descr[i]);
-
-			total += ROUND_UP(s, 1 << descr->align_shift);
+			total += get_elem_size(&descr->object.sub_descr[i]);
 		}
 
-		return total;
+		return ROUND_UP(total, 1 << descr->align_shift);
 	}
 	default:
 		return -EINVAL;