84 lines
2.4 KiB
Diff
84 lines
2.4 KiB
Diff
diff -pru jasper-1.900.1.orig/src/libjasper/base/jas_image.c jasper-1.900.1/src/libjasper/base/jas_image.c
|
|
--- jasper-1.900.1.orig/src/libjasper/base/jas_image.c 2016-02-01 14:53:56.000000000 +0100
|
|
+++ jasper-1.900.1/src/libjasper/base/jas_image.c 2016-02-01 21:49:58.746006339 +0100
|
|
@@ -433,6 +433,10 @@ int jas_image_readcmpt(jas_image_t *imag
|
|
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;
|
|
@@ -486,6 +490,10 @@ int jas_image_writecmpt(jas_image_t *ima
|
|
return -1;
|
|
}
|
|
|
|
+ if (!data->rows_) {
|
|
+ return -1;
|
|
+ }
|
|
+
|
|
if (jas_matrix_numrows(data) != height || jas_matrix_numcols(data) != width) {
|
|
return -1;
|
|
}
|
|
diff -pru jasper-1.900.1.orig/src/libjasper/base/jas_seq.c jasper-1.900.1/src/libjasper/base/jas_seq.c
|
|
--- jasper-1.900.1.orig/src/libjasper/base/jas_seq.c 2016-02-01 14:53:56.000000000 +0100
|
|
+++ jasper-1.900.1/src/libjasper/base/jas_seq.c 2016-02-01 21:53:45.149193159 +0100
|
|
@@ -266,6 +266,10 @@ void jas_matrix_divpow2(jas_matrix_t *ma
|
|
int rowstep;
|
|
jas_seqent_t *data;
|
|
|
|
+ if (!matrix->rows_) {
|
|
+ return;
|
|
+ }
|
|
+
|
|
rowstep = jas_matrix_rowstep(matrix);
|
|
for (i = matrix->numrows_, rowstart = matrix->rows_[0]; i > 0; --i,
|
|
rowstart += rowstep) {
|
|
@@ -286,6 +290,10 @@ void jas_matrix_clip(jas_matrix_t *matri
|
|
jas_seqent_t *data;
|
|
int rowstep;
|
|
|
|
+ if (!matrix->rows_) {
|
|
+ return;
|
|
+ }
|
|
+
|
|
rowstep = jas_matrix_rowstep(matrix);
|
|
for (i = matrix->numrows_, rowstart = matrix->rows_[0]; i > 0; --i,
|
|
rowstart += rowstep) {
|
|
@@ -310,6 +318,10 @@ void jas_matrix_asr(jas_matrix_t *matrix
|
|
int rowstep;
|
|
jas_seqent_t *data;
|
|
|
|
+ if (!matrix->rows_) {
|
|
+ return;
|
|
+ }
|
|
+
|
|
assert(n >= 0);
|
|
rowstep = jas_matrix_rowstep(matrix);
|
|
for (i = matrix->numrows_, rowstart = matrix->rows_[0]; i > 0; --i,
|
|
@@ -329,6 +341,10 @@ void jas_matrix_asl(jas_matrix_t *matrix
|
|
int rowstep;
|
|
jas_seqent_t *data;
|
|
|
|
+ if (!matrix->rows_) {
|
|
+ return;
|
|
+ }
|
|
+
|
|
rowstep = jas_matrix_rowstep(matrix);
|
|
for (i = matrix->numrows_, rowstart = matrix->rows_[0]; i > 0; --i,
|
|
rowstart += rowstep) {
|
|
@@ -371,6 +387,10 @@ void jas_matrix_setall(jas_matrix_t *mat
|
|
int rowstep;
|
|
jas_seqent_t *data;
|
|
|
|
+ if (!matrix->rows_) {
|
|
+ return;
|
|
+ }
|
|
+
|
|
rowstep = jas_matrix_rowstep(matrix);
|
|
for (i = matrix->numrows_, rowstart = matrix->rows_[0]; i > 0; --i,
|
|
rowstart += rowstep) {
|