json: Fix 64-bit support

mrfuchs · carlescufi · commit 8757c71bd04a · 2023-06-29T21:03:48.000+02:00
This patch fixes encoding arrays of objects on 64-bit targets. Fixes #36696 Signed-off-by: Markus Fuchs <markus.fuchs@ch.sauter-bc.com>
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;

Original file line number	Diff line number	Diff line change
`@@ -535,12 +535,10 @@ static ptrdiff_t get_elem_size(const struct json_obj_descr *descr)`
`535`	`535`	`size_t i;`
`536`	`536`
`537`	`537`	`for (i = 0; i < descr->object.sub_descr_len; i++) {`
`538`		`- ptrdiff_t s = get_elem_size(&descr->object.sub_descr[i]);`
`539`		`-`
`540`		`- total += ROUND_UP(s, 1 << descr->align_shift);`
	`538`	`+ total += get_elem_size(&descr->object.sub_descr[i]);`
`541`	`539`	`}`
`542`	`540`
`543`		`- return total;`
	`541`	`+ return ROUND_UP(total, 1 << descr->align_shift);`
`544`	`542`	`}`
`545`	`543`	`default:`
`546`	`544`	`return -EINVAL;`