fix issues reported by Clang Static Analyzer (second atempt)

karel-m · karel-m · commit 765fe13c3be5 · 2026-04-12T18:15:49.000+02:00
diff --git a/src/pqc/mlkem.c b/src/pqc/mlkem.c
@@ -143,17 +143,16 @@ static void s_mlkem_basemul(ishort16 r[2], const ishort16 a[2], const ishort16 b
 
 static ulong32 s_mlkem_load32_le(const unsigned char *x)
 {
-   return (ulong32)x[0]
-        | (ulong32)x[1] << 8
-        | (ulong32)x[2] << 16
-        | (ulong32)x[3] << 24;
+   ulong32 r;
+   LOAD32L(r, x);
+   return r;
 }
 
 static ulong32 s_mlkem_load24_le(const unsigned char *x)
 {
-   return (ulong32)x[0]
-        | (ulong32)x[1] << 8
-        | (ulong32)x[2] << 16;
+   return ((ulong32)(x[0] & 255))
+        | ((ulong32)(x[1] & 255) << 8)
+        | ((ulong32)(x[2] & 255) << 16);
 }
 
 static void s_mlkem_cbd2(mlkem_poly *r, const unsigned char *buf)

Original file line number	Diff line number	Diff line change
`@@ -143,17 +143,16 @@ static void s_mlkem_basemul(ishort16 r[2], const ishort16 a[2], const ishort16 b`
`143`	`143`
`144`	`144`	`static ulong32 s_mlkem_load32_le(const unsigned char *x)`
`145`	`145`	`{`
`146`		`- return (ulong32)x[0]`
`147`		`- \| (ulong32)x[1] << 8`
`148`		`- \| (ulong32)x[2] << 16`
`149`		`- \| (ulong32)x[3] << 24;`
	`146`	`+ ulong32 r;`
	`147`	`+ LOAD32L(r, x);`
	`148`	`+ return r;`
`150`	`149`	`}`
`151`	`150`
`152`	`151`	`static ulong32 s_mlkem_load24_le(const unsigned char *x)`
`153`	`152`	`{`
`154`		`- return (ulong32)x[0]`
`155`		`- \| (ulong32)x[1] << 8`
`156`		`- \| (ulong32)x[2] << 16;`
	`153`	`+ return ((ulong32)(x[0] & 255))`
	`154`	`+ \| ((ulong32)(x[1] & 255) << 8)`
	`155`	`+ \| ((ulong32)(x[2] & 255) << 16);`
`157`	`156`	`}`
`158`	`157`
`159`	`158`	`static void s_mlkem_cbd2(mlkem_poly r, const unsigned char buf)`