diff options
| -rw-r--r-- | third_party/libopenjpeg20/0031-undefined-shift-opj_bio_read.patch | 13 | ||||
| -rw-r--r-- | third_party/libopenjpeg20/README.pdfium | 1 | ||||
| -rw-r--r-- | third_party/libopenjpeg20/bio.c | 2 |
3 files changed, 16 insertions, 0 deletions
diff --git a/third_party/libopenjpeg20/0031-undefined-shift-opj_bio_read.patch b/third_party/libopenjpeg20/0031-undefined-shift-opj_bio_read.patch new file mode 100644 index 0000000000..22188bef99 --- /dev/null +++ b/third_party/libopenjpeg20/0031-undefined-shift-opj_bio_read.patch @@ -0,0 +1,13 @@ +diff --git a/third_party/libopenjpeg20/bio.c b/third_party/libopenjpeg20/bio.c +index e4edb3724..e51d0e2b4 100644 +--- a/third_party/libopenjpeg20/bio.c ++++ b/third_party/libopenjpeg20/bio.c +@@ -162,6 +162,8 @@ OPJ_UINT32 opj_bio_read(opj_bio_t *bio, OPJ_UINT32 n) { + OPJ_UINT32 i; + OPJ_UINT32 v; + v = 0; ++ if (n > 32) ++ n = 32; + for (i = n - 1; i < n; i--) { + v += opj_bio_getbit(bio) << i; + } diff --git a/third_party/libopenjpeg20/README.pdfium b/third_party/libopenjpeg20/README.pdfium index a75de2cca1..d73c72b827 100644 --- a/third_party/libopenjpeg20/README.pdfium +++ b/third_party/libopenjpeg20/README.pdfium @@ -40,4 +40,5 @@ Local Modifications: 0028-upstream-check-size-in-opj_j2k_read_siz.patch: upstream patch in j2k.c. 0029-avoid-division-by-0: fix some /0 and %0 in pi.c (caused by bad shifts). 0030-undefined-shift-opj_get_all_encoding_parameters.patch: fix undefined shift in pi.c method. +0031-undefined-shift-opj_bio_read.patch: fix undefined shift in bio.c method. TODO(thestig): List all the other patches. diff --git a/third_party/libopenjpeg20/bio.c b/third_party/libopenjpeg20/bio.c index e4edb3724e..e51d0e2b46 100644 --- a/third_party/libopenjpeg20/bio.c +++ b/third_party/libopenjpeg20/bio.c @@ -162,6 +162,8 @@ OPJ_UINT32 opj_bio_read(opj_bio_t *bio, OPJ_UINT32 n) { OPJ_UINT32 i; OPJ_UINT32 v; v = 0; + if (n > 32) + n = 32; for (i = n - 1; i < n; i--) { v += opj_bio_getbit(bio) << i; } |