Changeset ebb1489 in mainline for uspace/lib/gfximage/src/tga.c

Timestamp:

2024-10-13T08:23:40Z (2 months ago)

Author:

GitHub <noreply@…>

Children:

0472cf17

Parents:

2a0c827c (diff), b3b79981 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

• uspace/lib/gfximage/src/tga.c (modified) (1 diff)

uspace/lib/gfximage/src/tga.c

@@ -155 +155 @@
         tga->img_alpha_dir = (head->img_descr & 0xf0) >> 4;
         tga->img_data = tga->cmap_data + tga->cmap_length;
-        tga->img_length = ALIGN_UP(tga->width * tga->height * tga->img_bpp, 8) >> 3;
+
+        uint64_t length = (uint64_t) tga->width * tga->height * tga->img_bpp;
+        if (length & 0x7)
+                length += 8;
+        length >>= 3;
+
+        if (length > SIZE_MAX - sizeof(tga_header_t) - tga->id_length -
+            tga->cmap_length)
+                return false;
+
+        tga->img_length = length;
 
         if (size < sizeof(tga_header_t) + tga->id_length +