GraphicsMagick: Update library jasper to 1.900.5.
GraphicsMagick Commits <[email protected]>
| Newsgroups | gmane.comp.video.graphicsmagick.cvs |
|---|---|
| Message-ID | <mailman.36059.1671841853.1567.graphicsmagick-commit@lists.sourceforge.net> |
changeset a2ef3b572e3b in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=a2ef3b572e3b summary: Update library jasper to 1.900.5. diffstat: ChangeLog | 5 + jp2/ChangeLog | 171 +++++- jp2/configure | 743 +++++-------------------- jp2/configure.ac | 12 +- jp2/jasper.spec | 4 +- jp2/src/appl/imgcmp.c | 17 +- jp2/src/appl/imginfo.c | 12 +- jp2/src/appl/jiv.c | 8 +- jp2/src/libjasper/base/jas_cm.c | 18 +- jp2/src/libjasper/base/jas_icc.c | 43 +- jp2/src/libjasper/base/jas_image.c | 30 +- jp2/src/libjasper/base/jas_malloc.c | 86 ++- jp2/src/libjasper/base/jas_seq.c | 16 +- jp2/src/libjasper/base/jas_stream.c | 6 +- jp2/src/libjasper/base/jas_string.c | 2 +- jp2/src/libjasper/bmp/bmp_dec.c | 15 +- jp2/src/libjasper/bmp/bmp_enc.c | 12 +- jp2/src/libjasper/include/jasper/jas_config.h | 10 +- jp2/src/libjasper/include/jasper/jas_malloc.h | 11 +- jp2/src/libjasper/include/jasper/jas_seq.h | 4 +- jp2/src/libjasper/jp2/jp2_cod.c | 16 +- jp2/src/libjasper/jp2/jp2_dec.c | 4 +- jp2/src/libjasper/jp2/jp2_enc.c | 4 +- jp2/src/libjasper/jpc/jpc_cs.c | 54 +- jp2/src/libjasper/jpc/jpc_dec.c | 43 +- jp2/src/libjasper/jpc/jpc_enc.c | 20 +- jp2/src/libjasper/jpc/jpc_mqdec.c | 2 +- jp2/src/libjasper/jpc/jpc_mqenc.c | 2 +- jp2/src/libjasper/jpc/jpc_qmfb.c | 16 +- jp2/src/libjasper/jpc/jpc_t1enc.c | 2 +- jp2/src/libjasper/jpc/jpc_t2cod.c | 3 +- jp2/src/libjasper/jpc/jpc_t2dec.c | 6 +- jp2/src/libjasper/jpc/jpc_t2enc.c | 6 +- jp2/src/libjasper/jpc/jpc_tagtree.c | 3 +- jp2/src/libjasper/jpc/jpc_util.c | 2 +- jp2/src/libjasper/mif/mif_cod.c | 11 +- jp2/src/libjasper/ras/ras_dec.c | 5 +- 37 files changed, 679 insertions(+), 745 deletions(-) diffs (truncated from 2605 to 500 lines): diff -r 5d4883ae698b -r a2ef3b572e3b ChangeLog --- a/ChangeLog Fri Dec 23 17:07:18 2022 -0600 +++ b/ChangeLog Sat Dec 24 01:34:18 2022 +0100 @@ -1,3 +1,8 @@ +2022-12-24 Fojtik Jaroslav <[email protected]> + + * jp2/* Update lib jasper to 1.900.5. + + 2022-12-23 Bob Friesenhahn <[email protected]> * coders/jxl.c: Support reading and writing ICC, EXIF, and XMP diff -r 5d4883ae698b -r a2ef3b572e3b jp2/ChangeLog --- a/jp2/ChangeLog Fri Dec 23 17:07:18 2022 -0600 +++ b/jp2/ChangeLog Sat Dec 24 01:34:18 2022 +0100 @@ -1,6 +1,175 @@ +commit e85c498d29cde9d5062e7aaae5a6bf018e80552d +Author: Michael Adams <[email protected]> +Date: Sun Oct 16 11:56:53 2016 -0700 + + Bumped the version number + +M configure.ac + +commit 4031ca321d8cb5798c316ab39c7a5dc88a61fdd7 +Author: Michael Adams <[email protected]> +Date: Sun Oct 16 11:32:01 2016 -0700 + + Incorporated changes from patch + jasper-1.900.3-libjasper-stepsizes-overflow.patch + +M src/libjasper/jpc/jpc_cs.c + +commit 0d22460816ea58e74a124158fa6cc48efb709a47 +Author: Michael Adams <[email protected]> +Date: Sun Oct 16 11:13:32 2016 -0700 + + Incorporated changes from patch + jasper-1.900.3-CVE-2011-4516-CVE-2011-4517-CERT-VU-887409.patch + +M src/libjasper/jpc/jpc_cs.c + +commit 9607df5d29f4b307445e9bc16fadd70ee7ef3db8 +Author: Michael Adams <[email protected]> +Date: Sun Oct 16 10:49:12 2016 -0700 + + Incorporated changes from patch + jasper-1.900.3-Coverity-RESOURCE_LEAK.patch + +M src/appl/imgcmp.c +M src/libjasper/base/jas_cm.c +M src/libjasper/base/jas_image.c +M src/libjasper/bmp/bmp_enc.c +M src/libjasper/jpc/jpc_dec.c +M src/libjasper/jpc/jpc_tagtree.c +M src/libjasper/mif/mif_cod.c + +commit 944036a199adef07aa18670075bc3f08d45090dd +Author: Michael Adams <[email protected]> +Date: Sun Oct 16 10:19:32 2016 -0700 + + Incorporated patch jasper-1.900.3-Coverity-NULL_RETURNS.patch + +M src/libjasper/base/jas_image.c +M src/libjasper/base/jas_seq.c +M src/libjasper/include/jasper/jas_seq.h +M src/libjasper/jp2/jp2_cod.c + +commit fa19cadf7e16233427bfc217d6f913892d5f1fed +Author: Michael Adams <[email protected]> +Date: Sun Oct 16 09:42:06 2016 -0700 + + Fixed memory leak in jiv. + +M src/appl/jiv.c +M src/libjasper/base/jas_icc.c + +commit 722e943426ce74a8d7fc5e85267cbf603546b502 +Author: Michael Adams <[email protected]> +Date: Sun Oct 16 08:23:14 2016 -0700 + + Fixed indentation. + +M src/libjasper/base/jas_stream.c + +commit 8f62b4761711d036fd8964df256b938c809b7fca +Author: Michael Adams <[email protected]> +Date: Sat Oct 15 20:32:23 2016 -0700 + + Fixed a sanitizer failure in the BMP codec. + Also, added a --debug-level command line option to the imginfo command + for debugging purposes. + +M src/appl/imginfo.c +M src/libjasper/bmp/bmp_dec.c + +commit 4549e056f82d182a51e30ab93c30aa5f9ce72b2f +Author: Michael Adams <[email protected]> +Date: Sat Oct 15 14:03:36 2016 -0700 + + Bumped the version number + +M configure.ac + +commit 6109f6a4e731085f50aca1a483fa90668e3203d9 +Author: Michael Adams <[email protected]> +Date: Sat Oct 15 13:57:40 2016 -0700 + + Added some missing type casts to ensure promotion to the correct + unsigned type to avoid undefined behavior (and stop warnings from + USAN). + +M src/libjasper/mif/mif_cod.c +M src/libjasper/ras/ras_dec.c + +commit 8b6e9a08373d3bed83a220e0b9382416994106b3 +Author: Michael Adams <[email protected]> +Date: Sat Oct 15 13:26:14 2016 -0700 + + Use C99 + +M configure.ac + +commit 679d0843280a1eab95eb1dc14d50e280d6a7edad +Author: Michael Adams <[email protected]> +Date: Sat Oct 15 13:03:55 2016 -0700 + + Fixed a linking problem with newer versions of GCC. + +M src/libjasper/base/jas_malloc.c + +commit 31321cdb8a356e661c1c933ea8fdfe2f164ca910 +Author: Michael Adams <[email protected]> +Date: Sat Oct 15 12:49:35 2016 -0700 + + Changed --enable-debug configure option to enable some GCC sanitizers. + +M configure.ac + +commit d8c2604cd438c41ec72aff52c16ebd8183068020 +Author: Michael Adams <[email protected]> +Date: Sat Oct 15 12:22:28 2016 -0700 + + Added range check on XRsiz and YRsiz fields of SIZ marker segment. + +M src/libjasper/jpc/jpc_cs.c + +commit 3c55b399c36ef46befcb21e4ebc4799367f89684 +Author: Michael Adams <[email protected]> +Date: Sat Oct 15 10:42:19 2016 -0700 + + At many places in the code, jas_malloc or jas_recalloc was being + invoked with the size argument being computed in a manner that + would not + allow integer overflow to be detected. Now, these places in the code + have been modified to use special-purpose memory allocation functions + (e.g., jas_alloc2, jas_alloc3, jas_realloc2) that check for overflow. + This should fix many security problems. + +M src/libjasper/base/jas_cm.c +M src/libjasper/base/jas_icc.c +M src/libjasper/base/jas_image.c +M src/libjasper/base/jas_malloc.c +M src/libjasper/base/jas_seq.c +M src/libjasper/base/jas_stream.c +M src/libjasper/base/jas_string.c +M src/libjasper/bmp/bmp_dec.c +M src/libjasper/include/jasper/jas_malloc.h +M src/libjasper/jp2/jp2_cod.c +M src/libjasper/jp2/jp2_dec.c +M src/libjasper/jp2/jp2_enc.c +M src/libjasper/jpc/jpc_cs.c +M src/libjasper/jpc/jpc_dec.c +M src/libjasper/jpc/jpc_enc.c +M src/libjasper/jpc/jpc_mqdec.c +M src/libjasper/jpc/jpc_mqenc.c +M src/libjasper/jpc/jpc_qmfb.c +M src/libjasper/jpc/jpc_t1enc.c +M src/libjasper/jpc/jpc_t2cod.c +M src/libjasper/jpc/jpc_t2dec.c +M src/libjasper/jpc/jpc_t2enc.c +M src/libjasper/jpc/jpc_tagtree.c +M src/libjasper/jpc/jpc_util.c +M src/libjasper/mif/mif_cod.c + commit 779ddf80c2a9021d5ed134319c54bc38ca9ef9b6 Author: Michael Adams <[email protected]> -Date: Wed Oct 12 12:40:22 2016 -0700 +Date: Wed Oct 12 12:40:22 2016 -0700 Bump the version number. diff -r 5d4883ae698b -r a2ef3b572e3b jp2/configure --- a/jp2/configure Fri Dec 23 17:07:18 2022 -0600 +++ b/jp2/configure Sat Dec 24 01:34:18 2022 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for jasper 1.900.3. +# Generated by GNU Autoconf 2.69 for jasper 1.900.5. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='jasper' PACKAGE_TARNAME='jasper' -PACKAGE_VERSION='1.900.3' -PACKAGE_STRING='jasper 1.900.3' +PACKAGE_VERSION='1.900.5' +PACKAGE_STRING='jasper 1.900.5' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1341,7 +1341,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures jasper 1.900.3 to adapt to many kinds of systems. +\`configure' configures jasper 1.900.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1416,7 +1416,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of jasper 1.900.3:";; + short | recursive ) echo "Configuration of jasper 1.900.5:";; esac cat <<\_ACEOF @@ -1530,7 +1530,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -jasper configure 1.900.3 +jasper configure 1.900.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1949,7 +1949,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by jasper $as_me 1.900.3, which was +It was created by jasper $as_me 1.900.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -11507,7 +11507,7 @@ # Define the identity of the package. PACKAGE='jasper' - VERSION='1.900.3' + VERSION='1.900.5' cat >>confdefs.h <<_ACEOF @@ -11731,8 +11731,8 @@ # Initialize version information parameters. JAS_MAJOR_VERSION=1 JAS_MINOR_VERSION=900 -JAS_MICRO_VERSION=3 -JAS_VERSION=1.900.3 +JAS_MICRO_VERSION=5 +JAS_VERSION=1.900.5 @@ -11776,524 +11776,169 @@ # Checks for programs. ############################################################ -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - fi -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC