summaryrefslogtreecommitdiff
path: root/third_party
diff options
context:
space:
mode:
Diffstat (limited to 'third_party')
-rw-r--r--third_party/libopenjpeg20/0035-opj_image_data_free.patch35
-rw-r--r--third_party/libopenjpeg20/image.c2
-rw-r--r--third_party/libopenjpeg20/jp2.c4
3 files changed, 38 insertions, 3 deletions
diff --git a/third_party/libopenjpeg20/0035-opj_image_data_free.patch b/third_party/libopenjpeg20/0035-opj_image_data_free.patch
new file mode 100644
index 0000000000..8bd03a214e
--- /dev/null
+++ b/third_party/libopenjpeg20/0035-opj_image_data_free.patch
@@ -0,0 +1,35 @@
+diff --git a/third_party/libopenjpeg20/image.c b/third_party/libopenjpeg20/image.c
+index e29172b2b..bf7a70194 100644
+--- a/third_party/libopenjpeg20/image.c
++++ b/third_party/libopenjpeg20/image.c
+@@ -180,7 +180,7 @@ void opj_copy_image_header(const opj_image_t* p_image_src,
+ for (compno = 0; compno < p_image_dest->numcomps; compno++) {
+ opj_image_comp_t *image_comp = &(p_image_dest->comps[compno]);
+ if (image_comp->data) {
+- opj_free(image_comp->data);
++ opj_image_data_free(image_comp->data);
+ }
+ }
+ opj_free(p_image_dest->comps);
+diff --git a/third_party/libopenjpeg20/jp2.c b/third_party/libopenjpeg20/jp2.c
+index 9178f3fd6..e7e2db8bb 100644
+--- a/third_party/libopenjpeg20/jp2.c
++++ b/third_party/libopenjpeg20/jp2.c
+@@ -1083,7 +1083,7 @@ static OPJ_BOOL opj_jp2_apply_pclr(opj_image_t *image,
+ if (!new_comps[i].data) {
+ while (i > 0) {
+ -- i;
+- opj_free(new_comps[i].data);
++ opj_image_data_free(new_comps[i].data);
+ }
+ opj_free(new_comps);
+ opj_event_msg(p_manager, EVT_ERROR,
+@@ -1107,7 +1107,7 @@ static OPJ_BOOL opj_jp2_apply_pclr(opj_image_t *image,
+ /* Prevent null pointer access */
+ if (!src || !dst) {
+ for (j = 0; j < nr_channels; ++j) {
+- opj_free(new_comps[j].data);
++ opj_image_data_free(new_comps[j].data);
+ }
+ opj_free(new_comps);
+ new_comps = NULL;
diff --git a/third_party/libopenjpeg20/image.c b/third_party/libopenjpeg20/image.c
index e29172b2b5..bf7a701942 100644
--- a/third_party/libopenjpeg20/image.c
+++ b/third_party/libopenjpeg20/image.c
@@ -180,7 +180,7 @@ void opj_copy_image_header(const opj_image_t* p_image_src,
for (compno = 0; compno < p_image_dest->numcomps; compno++) {
opj_image_comp_t *image_comp = &(p_image_dest->comps[compno]);
if (image_comp->data) {
- opj_free(image_comp->data);
+ opj_image_data_free(image_comp->data);
}
}
opj_free(p_image_dest->comps);
diff --git a/third_party/libopenjpeg20/jp2.c b/third_party/libopenjpeg20/jp2.c
index 9178f3fd63..e7e2db8bb4 100644
--- a/third_party/libopenjpeg20/jp2.c
+++ b/third_party/libopenjpeg20/jp2.c
@@ -1083,7 +1083,7 @@ static OPJ_BOOL opj_jp2_apply_pclr(opj_image_t *image,
if (!new_comps[i].data) {
while (i > 0) {
-- i;
- opj_free(new_comps[i].data);
+ opj_image_data_free(new_comps[i].data);
}
opj_free(new_comps);
opj_event_msg(p_manager, EVT_ERROR,
@@ -1107,7 +1107,7 @@ static OPJ_BOOL opj_jp2_apply_pclr(opj_image_t *image,
/* Prevent null pointer access */
if (!src || !dst) {
for (j = 0; j < nr_channels; ++j) {
- opj_free(new_comps[j].data);
+ opj_image_data_free(new_comps[j].data);
}
opj_free(new_comps);
new_comps = NULL;