deleted file mode 100644
@@ -1,41 +0,0 @@
-From aca3603bed20772fd86ce5b901005668cee835ad Mon Sep 17 00:00:00 2001
-From: Stuart Caie <kyzer@cabextract.org.uk>
-Date: Mon, 15 Jun 2026 16:33:33 +0000
-Subject: [PATCH] kwajd_read_headers(): initialise pointers before returning
- any error
-
-CVE: CVE-2026-110602
-Upstream-Status: Backport [https://github.com/kyz/libmspack/commit/4d868504114346aa767d435fbb89a8b76603493f]
-
-Dropped changes for test and ChangeLog file.
-
-Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
----
- mspack/kwajd.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/mspack/kwajd.c b/mspack/kwajd.c
-index 30caa89..ede91dd 100644
---- a/mspack/kwajd.c
-+++ b/mspack/kwajd.c
-@@ -160,6 +160,11 @@ static int kwajd_read_headers(struct mspack_system *sys,
- unsigned char buf[16];
- int i;
-
-+
-+ /* initialise pointers */
-+ hdr->filename = NULL;
-+ hdr->extra = NULL;
-+
- /* read in the header */
- if (sys->read(fh, &buf[0], kwajh_SIZEOF) != kwajh_SIZEOF) {
- return MSPACK_ERR_READ;
-@@ -177,8 +182,6 @@ static int kwajd_read_headers(struct mspack_system *sys,
- hdr->data_offset = EndGetI16(&buf[kwajh_DataOffset]);
- hdr->headers = EndGetI16(&buf[kwajh_Flags]);
- hdr->length = 0;
-- hdr->filename = NULL;
-- hdr->extra = NULL;
- hdr->extra_length = 0;
-
- /* optional headers */
similarity index 78%
rename from meta-oe/recipes-support/cabextract/libmspack_0.11alpha.bb
rename to meta-oe/recipes-support/cabextract/libmspack_0.12alpha.bb
@@ -8,10 +8,8 @@ LICENSE = "LGPL-2.1-only"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34"
-SRC_URI = "https://www.cabextract.org.uk/libmspack/libmspack-${PV}.tar.gz \
- file://CVE-2026-110602.patch \
-"
-SRC_URI[sha256sum] = "70dd1fb2f0aecc36791b71a1e1840e62173079eadaa081192d1c323a0eeea21b"
+SRC_URI = "https://www.cabextract.org.uk/libmspack/libmspack-${PV}.tar.gz"
+SRC_URI[sha256sum] = "1834d1079a6e8db9546fa95d3a1fc2cf676124a8a60bbdd7f30b2db4eb4ad683"
inherit autotools
- test/chminfo.c: add various guards to stop out-of-bounds reads when reading CHM files with unusual structure sizes. - cabd_read_files(): Don't set merge_next/merge_prev if the file is skipped, which happens if salvage mode is enabled and the file's filename is blank or overlong. Otherwise, cabd_can_merge_folders() will read from the skipped file's freed memory when comparing file lists, which typically crashes. - cabd_read_files(): now rejects cabs for having file folder index 0xFFFF ("continued previous and next"), but more than one folder. - cabd_read_string(): seek to the byte after a string if it's null-terminated but empty (when it's not allowed to be), so that salvage mode can continue reading if that was the only problem. Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> --- .../libmspack/CVE-2026-110602.patch | 41 ------------------- ...ck_0.11alpha.bb => libmspack_0.12alpha.bb} | 6 +-- 2 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 meta-oe/recipes-support/cabextract/libmspack/CVE-2026-110602.patch rename meta-oe/recipes-support/cabextract/{libmspack_0.11alpha.bb => libmspack_0.12alpha.bb} (78%)