Eharve14
76d50ceeb9
Corrected type for num_images in main, was singed integer
2022-01-15 20:54:25 -05:00
Eharve14
998366be07
Style fix, deleted whitespace.
2022-01-15 17:35:54 -05:00
Eharve14
26a5626830
Set number of jobs to rh.
2022-01-15 17:26:31 -05:00
Eharve14
3a71edff4d
TEst
2022-01-15 17:00:33 -05:00
Eharve14
d2bffdf7c2
Merge branch 'uclouvain:master' into master
2022-01-15 15:36:41 -05:00
Eharve14
6e4588f379
Added check for integer overflow in get_num_images ( #1397 )
...
As discussed in pull request 1396, added a check for integer overflow.
Change list:
Defined num_images as unsigned int
Moved the if statement to check for an empty directory to the beginning of the read directory section
Added a check to see if num images would roll back to zero when incrementing.
2022-01-15 15:33:03 +01:00
Eharve14
43bf2bec84
Re-Revised to use break statement instead of return.
2022-01-15 09:14:13 -05:00
Eharve14
67536c7144
Style fix
2022-01-14 21:51:23 -05:00
Eharve14
7766d9c81d
Added return statement to break iteration
2022-01-14 21:20:18 -05:00
Eharve14
e011787bb1
Added import of limits.h, revised overflow check, Redefined Return value for get_num_images
2022-01-14 15:23:36 -05:00
Eharve14
081bc3e096
Fixed style
2022-01-13 16:36:23 -05:00
Eharve14
21ac2bbf54
Merge branch 'master' of https://github.com/Eharve14/openjpeg
2022-01-13 16:29:46 -05:00
Eharve14
96c6587801
Same as last
2022-01-13 16:29:42 -05:00
Eharve14
912a144c27
Fixed issues with get_num_images, moved the zero file check to prevent exicution of allocation and strcpy if there are no images.
2022-01-13 16:29:30 -05:00
Eharve14
3882583e53
Merge pull request #1 from uclouvain/master
...
Added overflow protection in get_num_images function, redefined num_images to unsigned int in compress and decompress to match dump
2022-01-13 16:23:19 -05:00
Eharve14
cbc8b26fb9
Revert "Added overflow check to get_num_images, defined num_images as unsigned for conformity, relocated check for num images for exicution before allocation and image loading"
...
This reverts commit ab6c7c7203
.
2022-01-13 16:22:29 -05:00
Eharve14
957a6cd70e
Revert "Fixed style"
...
This reverts commit dbe64d6fe0
.
2022-01-13 16:22:23 -05:00
Eharve14
dbe64d6fe0
Fixed style
2022-01-13 16:15:56 -05:00
Eharve14
ab6c7c7203
Added overflow check to get_num_images, defined num_images as unsigned for conformity, relocated check for num images for exicution before allocation and image loading
2022-01-13 15:20:48 -05:00
Eharve14
1daaa0b909
Avoid overflow in multiplications in utilities related to big number of files in a directory (CVE-2021-29338) ( #1396 )
2022-01-13 21:05:52 +01:00
Even Rouault
e27cfb39c9
Update src/bin/jp2/opj_dump.c
2022-01-13 19:28:23 +01:00
Even Rouault
323a089003
Update src/bin/jp2/opj_dump.c
2022-01-13 19:22:22 +01:00
Eharve14
7c422579a3
Why, why is this happening
2022-01-13 13:17:40 -05:00
Eharve14
305819492c
I am bad and I feel bad, I should have just used the scrypt
2022-01-13 13:05:58 -05:00
Eharve14
a0b7102434
Style part two
2022-01-13 13:02:57 -05:00
Eharve14
98f4acef63
style updates
2022-01-13 12:58:28 -05:00
Eharve14
efa9c7e76b
Revised to casts, deleted all other changes
2022-01-13 12:48:58 -05:00
Eharve14
968cf54a95
Revised to catch negitive values of num_images
2022-01-13 12:04:59 -05:00
Eharve14
d8fe12641e
Revert "Revised to address int overflow in for loop only"
...
This reverts commit e74ee84320
.
2022-01-13 11:35:20 -05:00
Eric Harvey
e74ee84320
Revised to address int overflow in for loop only
2022-01-13 10:44:11 -05:00
Eric Harvey
85b471f56a
Merge branch 'master' of https://github.com/Eharve14/openjpeg
2022-01-13 02:20:58 -05:00
Eric Harvey
fc2d47a369
Fixed typo
2022-01-13 02:20:52 -05:00
Eharve14
c26117251b
Delete settings.json
...
Removed automatically generated settings.json
2022-01-13 01:37:27 -05:00
Eric Harvey
d564919d3a
Added multiplication check for calloc calls, see comment on commit 79c7d7a
2022-01-13 00:55:34 -05:00
Eric Harvey
33c2d33c5d
Added multiplication check to calloc calls in opj_compress, opj_decompress, opj_dump. See comment on commit 79c7d7a
.
2022-01-13 00:53:55 -05:00
Brad Parham
79c7d7af59
opj_compress/opj_uncompress: fix integer overflow in num_images ( #1395 )
...
Includes the fix for CVE-2021-29338
Credit to @kaniini based on #1346
Fixes #1338
2022-01-12 13:46:10 +01:00
Even Rouault
fe2fa70716
Merge pull request #1392 from stweil/duplicate
...
Remove duplicate assignments in function tiftoimage
2021-12-10 11:57:41 +01:00
Stefan Weil
af8339d33f
Remove duplicate assignments in function tiftoimage
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2021-12-10 11:29:06 +01:00
Even Rouault
22eb737d5d
Merge pull request #1390 from stweil/typos
...
Fix some typos (found by codespell)
2021-12-05 14:32:51 +01:00
Stefan Weil
6ec9871eca
Format source file with typo fixes
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2021-12-05 13:38:47 +01:00
Stefan Weil
ef73ad1c97
Fix singular/plural mismatch
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2021-12-05 13:32:09 +01:00
Stefan Weil
667149ffa1
Fix some typos (found by codespell)
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2021-12-05 13:14:33 +01:00
msheby
90481203a2
opj_compress: add a -TargetBitDepth switch for TIFF output ( #1384 )
...
Sometimes, given the same (16-bit TIF) input, one wants to generate a variety of J2C outputs (say, 16-, 12-, and 10-bit). This patch allows one to downsample input files, and so makes it easier to automate OpenJPEG in mass generation of J2Cs without having to pipe though an image processing program.
2021-10-27 14:10:50 +02:00
Even Rouault
9f70bf0ad1
Merge pull request #1383 from rouault/deprecate_bpp
...
API: deprecate 'bpp' member in favor of 'prec'
2021-10-21 17:21:36 +02:00
Even Rouault
0b5d62684f
API: deprecate 'bpp' member in favor of 'prec'
...
in opj_image_comp and opj_image_comptparm structures.
bpp was redundant with prec, and almost never set by the library, except
by opj_image_create(). This change should hopefully not impact existing,
working, users of the API, which should already have used prec to get
things working.
Fixes #1379
2021-10-21 14:13:58 +02:00
Even Rouault
3835f37084
tests/: reformat a few files to be modified
2021-10-21 13:12:33 +02:00
Even Rouault
714c63efee
tests/fuzzers/build_seed_corpus.sh: add htj2k files
2021-09-27 08:04:57 +02:00
Even Rouault
0fbeeff48e
Test decoding a .jhc file with vertically causal context variation
2021-09-26 13:02:52 +02:00
Even Rouault
cee8802150
README.md: update badge to github action workflows [ci skip]
2021-09-26 12:49:05 +02:00
Even Rouault
2e977fac16
Test decoding a .jph test file
2021-09-26 12:41:05 +02:00