mirror of
https://git.freebsd.org/ports.git
synced 2025-07-09 13:29:24 -04:00
1a3c3e5ae9
- fix double-free in in jas_iccattrval_destroy() Obtained from: RedHat Security: CVE-2014-8137 Security: https://bugzilla.redhat.com/show_bug.cgi?id=1173157 - fix heap overflow in jp2_decode() Obtained from: RedHat Security: CVE-2014-8138 Security: https://bugzilla.redhat.com/show_bug.cgi?id=1173162 - dec->numtiles off-by-one check in jpc_dec_process_sot() Obtained from: RedHat, Fedora Security: CVE-2014-8157 Security: https://bugzilla.redhat.com/show_bug.cgi?id=1179282 - multiple stack-based buffer overflows Obtained from: RedHat, Fedora Security: CVE-2014-8158 Security: https://bugzilla.redhat.com/show_bug.cgi?id=1179282 - fix Heap overflows in libjasper Obtained from: RedHat Security: CVE-2014-9029 Security: https://bugzilla.redhat.com/show_bug.cgi?id=1167537 - fix Use-after-free (and double-free) Security: CVE-2015-5221 Security: http://www.openwall.com/lists/oss-security/2015/08/20/4 PR: 203504 - patch (rows_ NULL check) Obtained from: RedHat Security: CVE-2016-2089 Security: https://bugzilla.redhat.com/show_bug.cgi?id=1302636
43 lines
1.2 KiB
C
43 lines
1.2 KiB
C
--- src/libjasper/base/jas_image.c.orig 2007-01-19 22:43:05.000000000 +0100
|
|
+++ src/libjasper/base/jas_image.c 2016-02-20 13:59:00.999124000 +0100
|
|
@@ -142,7 +142,7 @@
|
|
image->inmem_ = true;
|
|
|
|
/* Allocate memory for the per-component information. */
|
|
- if (!(image->cmpts_ = jas_malloc(image->maxcmpts_ *
|
|
+ if (!(image->cmpts_ = jas_malloc2(image->maxcmpts_,
|
|
sizeof(jas_image_cmpt_t *)))) {
|
|
jas_image_destroy(image);
|
|
return 0;
|
|
@@ -426,6 +426,10 @@
|
|
return -1;
|
|
}
|
|
|
|
+ if (!data->rows_) {
|
|
+ return -1;
|
|
+ }
|
|
+
|
|
if (jas_matrix_numrows(data) != height || jas_matrix_numcols(data) != width) {
|
|
if (jas_matrix_resize(data, height, width)) {
|
|
return -1;
|
|
@@ -479,6 +483,10 @@
|
|
return -1;
|
|
}
|
|
|
|
+ if (!data->rows_) {
|
|
+ return -1;
|
|
+ }
|
|
+
|
|
if (jas_matrix_numrows(data) != height || jas_matrix_numcols(data) != width) {
|
|
return -1;
|
|
}
|
|
@@ -774,8 +782,7 @@
|
|
jas_image_cmpt_t **newcmpts;
|
|
int cmptno;
|
|
|
|
- newcmpts = (!image->cmpts_) ? jas_malloc(maxcmpts * sizeof(jas_image_cmpt_t *)) :
|
|
- jas_realloc(image->cmpts_, maxcmpts * sizeof(jas_image_cmpt_t *));
|
|
+ newcmpts = jas_realloc2(image->cmpts_, maxcmpts, sizeof(jas_image_cmpt_t *));
|
|
if (!newcmpts) {
|
|
return -1;
|
|
}
|