summaryrefslogtreecommitdiff
path: root/graphics/jasper/files/patch-jas_seq.c
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2013-04-17 21:25:47 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2013-04-17 21:25:47 +0000
commit9ad3263e802afd53731df2dce73199621e62ecde (patch)
tree6ae1451fe5b1dcbd9d73dfa71232906735920136 /graphics/jasper/files/patch-jas_seq.c
parent- Update to 2.2 (diff)
graphics/jasper
- Security fixes Multiple integer overflows Buffer overflow in the jas_stream_printf execute arbitrary code on decodes images Security: CVE-2008-3520 Security: CVE-2008-3522 Security: CVE-2011-4516 Security: CVE-2011-4517 PR: 163718 Obtained from: Fedora Feature safe: yes
Notes
Notes: svn path=/head/; revision=316008
Diffstat (limited to 'graphics/jasper/files/patch-jas_seq.c')
-rw-r--r--graphics/jasper/files/patch-jas_seq.c29
1 files changed, 29 insertions, 0 deletions
diff --git a/graphics/jasper/files/patch-jas_seq.c b/graphics/jasper/files/patch-jas_seq.c
new file mode 100644
index 000000000000..8baa54dfc672
--- /dev/null
+++ b/graphics/jasper/files/patch-jas_seq.c
@@ -0,0 +1,29 @@
+--- src/libjasper/base/jas_seq.c.orig 2007-01-19 22:43:05.000000000 +0100
++++ src/libjasper/base/jas_seq.c 2013-04-17 22:32:23.000000000 +0200
+@@ -114,7 +114,7 @@
+ matrix->datasize_ = numrows * numcols;
+
+ if (matrix->maxrows_ > 0) {
+- if (!(matrix->rows_ = jas_malloc(matrix->maxrows_ *
++ if (!(matrix->rows_ = jas_malloc2(matrix->maxrows_,
+ sizeof(jas_seqent_t *)))) {
+ jas_matrix_destroy(matrix);
+ return 0;
+@@ -122,7 +122,7 @@
+ }
+
+ if (matrix->datasize_ > 0) {
+- if (!(matrix->data_ = jas_malloc(matrix->datasize_ *
++ if (!(matrix->data_ = jas_malloc2(matrix->datasize_,
+ sizeof(jas_seqent_t)))) {
+ jas_matrix_destroy(matrix);
+ return 0;
+@@ -220,7 +220,7 @@
+ mat0->numrows_ = r1 - r0 + 1;
+ mat0->numcols_ = c1 - c0 + 1;
+ mat0->maxrows_ = mat0->numrows_;
+- mat0->rows_ = jas_malloc(mat0->maxrows_ * sizeof(jas_seqent_t *));
++ mat0->rows_ = jas_malloc2(mat0->maxrows_, sizeof(jas_seqent_t *));
+ for (i = 0; i < mat0->numrows_; ++i) {
+ mat0->rows_[i] = mat1->rows_[r0 + i] + c0;
+ }