summaryrefslogtreecommitdiff
path: root/third_party
diff options
context:
space:
mode:
Diffstat (limited to 'third_party')
-rw-r--r--third_party/libopenjpeg20/0025-opj_j2k_add_mct_null_data.patch22
-rw-r--r--third_party/libopenjpeg20/README.pdfium1
-rw-r--r--third_party/libopenjpeg20/j2k.c4
3 files changed, 25 insertions, 2 deletions
diff --git a/third_party/libopenjpeg20/0025-opj_j2k_add_mct_null_data.patch b/third_party/libopenjpeg20/0025-opj_j2k_add_mct_null_data.patch
new file mode 100644
index 0000000000..4a371e5c88
--- /dev/null
+++ b/third_party/libopenjpeg20/0025-opj_j2k_add_mct_null_data.patch
@@ -0,0 +1,22 @@
+diff --git a/third_party/libopenjpeg20/j2k.c b/third_party/libopenjpeg20/j2k.c
+index 5de89cf0e..400ca8098 100644
+--- a/third_party/libopenjpeg20/j2k.c
++++ b/third_party/libopenjpeg20/j2k.c
+@@ -5715,7 +5715,7 @@ static OPJ_BOOL opj_j2k_add_mct(opj_tcp_t * p_tcp, opj_image_t * p_image, OPJ_UI
+
+ if (l_deco_array) {
+ l_data_size = MCT_ELEMENT_SIZE[l_deco_array->m_element_type] * p_image->numcomps * p_image->numcomps;
+- if (l_deco_array->m_data_size != l_data_size) {
++ if (l_deco_array->m_data_size != l_data_size || ! l_deco_array->m_data) {
+ return OPJ_FALSE;
+ }
+
+@@ -5734,7 +5734,7 @@ static OPJ_BOOL opj_j2k_add_mct(opj_tcp_t * p_tcp, opj_image_t * p_image, OPJ_UI
+
+ if (l_offset_array) {
+ l_data_size = MCT_ELEMENT_SIZE[l_offset_array->m_element_type] * p_image->numcomps;
+- if (l_offset_array->m_data_size != l_data_size) {
++ if (l_offset_array->m_data_size != l_data_size || ! l_offset_array->m_data) {
+ return OPJ_FALSE;
+ }
+
diff --git a/third_party/libopenjpeg20/README.pdfium b/third_party/libopenjpeg20/README.pdfium
index 0f453373f9..093f7fe9bd 100644
--- a/third_party/libopenjpeg20/README.pdfium
+++ b/third_party/libopenjpeg20/README.pdfium
@@ -34,4 +34,5 @@ Local Modifications:
0022-jp2_apply_pclr_overflow.patch: Prevent integer overflow in opj_jp2_apply_pclr.
0023-opj_j2k_read_mct_records.patch: Fix opj_j2k_read to prevent heap-use-after-free.
0024-l_marker_size_check.patch: Return error before overflow in opj_j2k_read_header_procedure.
+0025-opj_j2k_add_mct_null_data.patch: Check m_data != null before trying to read from it.
TODO(thestig): List all the other patches.
diff --git a/third_party/libopenjpeg20/j2k.c b/third_party/libopenjpeg20/j2k.c
index 5de89cf0e7..400ca80984 100644
--- a/third_party/libopenjpeg20/j2k.c
+++ b/third_party/libopenjpeg20/j2k.c
@@ -5715,7 +5715,7 @@ static OPJ_BOOL opj_j2k_add_mct(opj_tcp_t * p_tcp, opj_image_t * p_image, OPJ_UI
if (l_deco_array) {
l_data_size = MCT_ELEMENT_SIZE[l_deco_array->m_element_type] * p_image->numcomps * p_image->numcomps;
- if (l_deco_array->m_data_size != l_data_size) {
+ if (l_deco_array->m_data_size != l_data_size || ! l_deco_array->m_data) {
return OPJ_FALSE;
}
@@ -5734,7 +5734,7 @@ static OPJ_BOOL opj_j2k_add_mct(opj_tcp_t * p_tcp, opj_image_t * p_image, OPJ_UI
if (l_offset_array) {
l_data_size = MCT_ELEMENT_SIZE[l_offset_array->m_element_type] * p_image->numcomps;
- if (l_offset_array->m_data_size != l_data_size) {
+ if (l_offset_array->m_data_size != l_data_size || ! l_offset_array->m_data) {
return OPJ_FALSE;
}