all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
blob 030a34a19b7ca4fb55308e975eba63a95a1e7cf9 1767 bytes (raw)
name: gnu/packages/patches/jasper-CVE-2014-8137.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
 
 Fix CVE-2014-8137 (double-free in jas_iccattrval_destroy()).

Copied from Fedora.

http://pkgs.fedoraproject.org/cgit/rpms/jasper.git/tree/jasper-CVE-2014-8137.patch
https://bugzilla.redhat.com/show_bug.cgi?id=1173157

--- jasper-1.900.1.orig/src/libjasper/base/jas_icc.c	2014-12-11 14:06:44.000000000 +0100
+++ jasper-1.900.1/src/libjasper/base/jas_icc.c	2014-12-11 15:16:37.971272386 +0100
@@ -1009,7 +1009,6 @@ static int jas_icccurv_input(jas_iccattr
 	return 0;
 
 error:
-	jas_icccurv_destroy(attrval);
 	return -1;
 }
 
@@ -1127,7 +1126,6 @@ static int jas_icctxtdesc_input(jas_icca
 #endif
 	return 0;
 error:
-	jas_icctxtdesc_destroy(attrval);
 	return -1;
 }
 
@@ -1206,8 +1204,6 @@ static int jas_icctxt_input(jas_iccattrv
 		goto error;
 	return 0;
 error:
-	if (txt->string)
-		jas_free(txt->string);
 	return -1;
 }
 
@@ -1328,7 +1324,6 @@ static int jas_icclut8_input(jas_iccattr
 		goto error;
 	return 0;
 error:
-	jas_icclut8_destroy(attrval);
 	return -1;
 }
 
@@ -1497,7 +1492,6 @@ static int jas_icclut16_input(jas_iccatt
 		goto error;
 	return 0;
 error:
-	jas_icclut16_destroy(attrval);
 	return -1;
 }
 
--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c	2014-12-11 14:30:54.193209780 +0100
+++ jasper-1.900.1/src/libjasper/jp2/jp2_dec.c	2014-12-11 14:36:46.313217814 +0100
@@ -291,7 +291,10 @@ jas_image_t *jp2_decode(jas_stream_t *in
 	case JP2_COLR_ICC:
 		iccprof = jas_iccprof_createfrombuf(dec->colr->data.colr.iccp,
 		  dec->colr->data.colr.iccplen);
-		assert(iccprof);
+		if (!iccprof) {
+			jas_eprintf("error: failed to parse ICC profile\n");
+			goto error;
+		}
 		jas_iccprof_gethdr(iccprof, &icchdr);
 		jas_eprintf("ICC Profile CS %08x\n", icchdr.colorspc);
 		jas_image_setclrspc(dec->image, fromiccpcs(icchdr.colorspc));

debug log:

solving 030a34a ...
found 030a34a in https://yhetil.org/guix/b1e335e2f204dd2e959c22d2064dc18611f61b46.1454188449.git.leo@famulari.name/

applying [1/1] https://yhetil.org/guix/b1e335e2f204dd2e959c22d2064dc18611f61b46.1454188449.git.leo@famulari.name/
diff --git a/gnu/packages/patches/jasper-CVE-2014-8137.patch b/gnu/packages/patches/jasper-CVE-2014-8137.patch
new file mode 100644
index 0000000..030a34a

1:17: space before tab in indent.
 	return 0;
1:18: trailing whitespace.
 
1:21: space before tab in indent.
 	return -1;
1:23: trailing whitespace.
 
1:26: space before tab in indent.
 	return 0;
Checking patch gnu/packages/patches/jasper-CVE-2014-8137.patch...
Applied patch gnu/packages/patches/jasper-CVE-2014-8137.patch cleanly.
warning: squelched 20 whitespace errors
warning: 25 lines add whitespace errors.

index at:
100644 030a34a19b7ca4fb55308e975eba63a95a1e7cf9	gnu/packages/patches/jasper-CVE-2014-8137.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.