Commit Graph

3008 Commits

Author SHA1 Message Date
Eharve14 122093bef4 Added type casts to prevent unitended overflow. 2022-01-18 15:13:11 -05:00
Eharve14 8f5d7dd9c5 Revised iterator type in jp2.c, added cast to to memory allocation to prevent possible overflow before call in j2k.c. 2022-01-18 15:02:41 -05:00
Eric Harvey cc635ec3e5
Merge branch 'uclouvain:master' into master 2022-01-18 11:25:31 -05:00
Even Rouault d87fd9279a
Merge pull request #1401 from rouault/fix_1399
opj_j2k_setup_encoder(): validate number of tiles to avoid illegal values and potential overflow (fixes #1399)
2022-01-18 17:22:44 +01:00
Even Rouault 70f5e0a0df
opj_j2k_setup_encoder(): validate number of tiles to avoid illegal values and potential overflow (fixes #1399) 2022-01-18 15:44:18 +01:00
Eric Harvey c4bbb4e558
Merge branch 'uclouvain:master' into master 2022-01-16 13:55:55 -05:00
Eric Harvey a1eec9c49e
Fix unsigned vs OPJ_INT32 mismatches (#1398) 2022-01-16 18:54:00 +01:00
Eharve14 c0ba980f0a Style fix 2022-01-16 11:44:01 -05:00
Eharve14 2947bf2850 Fixed signed issues in print statements, correced addtional signed issues in opj_compress.c related to signed integer use 2022-01-16 11:39:41 -05:00
Eharve14 8bb3ea7e71 Stylefix 2022-01-15 22:21:20 -05:00
Eharve14 1dbc41a06c fixed iterator issue in for loop to set up dirptr 2022-01-15 22:12:54 -05:00
Eharve14 85b248b1a8 Resloved issue where imagino used to iterate through files retrived was signed, causing possible overflow 2022-01-15 22:10:43 -05:00
Eharve14 fc88a3048b same as last 2022-01-15 21:54:37 -05:00
Eharve14 54a80d7c54 Reviesed to keep int type for other variables 2022-01-15 21:54:21 -05:00
Eharve14 7e3b389a68 Merge branch 'master' of https://github.com/Eharve14/openjpeg 2022-01-15 21:02:32 -05:00
Eharve14 56f9a7e14e Revert "TEst"
This reverts commit 3a71edff4d.
2022-01-15 21:01:53 -05:00
Eharve14 79e41332c2 Revert "Set number of jobs to rh."
This reverts commit 26a5626830.
2022-01-15 21:01:49 -05:00
Eharve14 a46ab03f33 Revert "Style fix, deleted whitespace."
This reverts commit 998366be07.
2022-01-15 21:01:39 -05:00
Eharve14 8f5f221dd8
Delete dwt.c
Not needed
2022-01-15 20:57:13 -05:00
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