Skip to content

Commit

Permalink
Merge branch 'release'
Browse files Browse the repository at this point in the history
  • Loading branch information
@saitoha
saitoha committed Dec 14, 2019
2 parents 2df6437 + d2ff593 commit 9d9d186
Show file tree
Hide file tree
Showing 18 changed files with 474 additions and 55 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
View file
Expand Up @@ -11,8 +11,8 @@ matrix:
env: XCC=clang HOST= PREFIX=/usr/local DEBUG="--enable-tests --enable-debug" WINE= LIBCURL=--without-libcurl JPEG=--without-jpeg PNG=--without-png
- os: linux
env: XCC=i686-w64-mingw32-gcc HOST="--host=i686-w64-mingw32" PREFIX="/usr/i686-w64-mingw32" DEBUG="--enable-tests --enable-debug" WINE=wine
- os: linux
env: XCC=i586-mingw32msvc-gcc HOST="--host=i586-mingw32msvc" PREFIX="/usr/i586-mingw32msvc" WINE=wine
# - os: linux
# env: XCC=i586-mingw32msvc-gcc HOST="--host=i586-mingw32msvc" PREFIX="/usr/i586-mingw32msvc" WINE=wine
- os: linux
env: XCC=x86_64-w64-mingw32-gcc HOST="--host=x86_64-w64-mingw32" PREFIX="/usr/x86_64-w64-mingw32" DEBUG="--enable-tests --enable-debug" WINE=wine64
- os: linux
Expand Down Expand Up @@ -68,7 +68,7 @@ before_install:
- "if [ x$TRAVIS_OS_NAME = xlinux -a x$XCC = xclang ]; then sudo apt-get install -qq clang; fi"
- "if [ x$TRAVIS_OS_NAME = xlinux -a x$XCC = xgcc ]; then sudo apt-get install -qq gcc; fi"
- "if [ x$TRAVIS_OS_NAME = xlinux -a x$XCC = xi686-w64-mingw32-gcc ]; then sudo apt-get install -qq gcc-mingw-w64-i686 binutils-mingw-w64-i686; fi"
- "if [ x$TRAVIS_OS_NAME = xlinux -a x$XCC = xi586-mingw32msvc-gcc ]; then sudo apt-get install -qq mingw32; fi"
# - "if [ x$TRAVIS_OS_NAME = xlinux -a x$XCC = xi586-mingw32msvc-gcc ]; then sudo apt-get install -qq mingw32; fi"
- "if [ x$TRAVIS_OS_NAME = xlinux -a x$XCC = xx86_64-w64-mingw32-gcc ]; then sudo apt-get install -qq gcc-mingw-w64-x86-64 binutils-mingw-w64-x86-64; fi"
- "if [ x$TRAVIS_OS_NAME = xlinux -a x$GCOV != x ]; then sudo apt-get install libyaml-dev; fi"
- "if [ x$TRAVIS_OS_NAME = xosx -a x$GCOV != x ]; then brew install libyaml; fi"
Expand Down
183 changes: 183 additions & 0 deletions ChangeLog
View file
@@ -1,3 +1,186 @@
2019-12-13 Hayaki Saito <saitoha@me.com>

* src/loader.c: Suppress glib deprecated warnings

* .travis.yml: Ammend fix for e18ebe6

* .travis.yml: Drop mingw32 build

* src/loader.c: Suppress glib deprecated warnings

* .travis.yml: Ammend fix for e18ebe6

* .travis.yml: Drop mingw32 build

* src/loader.c: Suppress glib deprecated warnings

* .travis.yml: Ammend fix for e18ebe6

* .travis.yml: Drop mingw32 build

* src/loader.c: Suppress glib deprecated warnings

* .travis.yml: Ammend fix for e18ebe6

* .travis.yml: Drop mingw32 build

* src/loader.c: Suppress glib deprecated warnings

* .travis.yml: Ammend fix for e18ebe6

* src/loader.c: Suppress glib deprecated warnings

* .travis.yml: Ammend fix for e18ebe6

* .travis.yml: Drop mingw32 build

* src/loader.c: Suppress glib deprecated warnings

* .travis.yml: Ammend fix for e18ebe6

* .travis.yml: Drop mingw32 build

* src/loader.c: Suppress glib deprecated warnings

* .travis.yml: Ammend fix for e18ebe6

* .travis.yml: Drop mingw32 build

* src/loader.c: Suppress glib deprecated warnings

* .travis.yml: Ammend fix for e18ebe6

* .travis.yml: Drop mingw32 build

* src/loader.c: Suppress glib deprecated warnings

* .travis.yml: Ammend fix for e18ebe6

* .travis.yml: Drop mingw32 build

* src/loader.c: Suppress glib deprecated warnings

* .travis.yml: Ammend fix for e18ebe6

* .travis.yml: Drop mingw32 build

* src/loader.c: Suppress glib deprecated warnings

* .travis.yml: Ammend fix for e18ebe6

* .travis.yml: Drop mingw32 build

* src/loader.c: Suppress glib deprecated warnings

* .travis.yml: Ammend fix for e18ebe6

* .travis.yml: Drop mingw32 build

* src/loader.c: Suppress glib deprecated warnings

* .travis.yml: Ammend fix for e18ebe6

* .travis.yml: Drop mingw32 build

* .travis.yml: Drop mingw32 build

2019-12-02 pwd <weidangpeng@gmail.com>

* src/fromsixel.c: use function safe_addition_for_params to check integer
overflow

* src/frompnm.c: fix issue that the width and the deps miss checks

* include/sixel.h.in, src/status.c: define macro SIXEL_BAD_INTEGER_OVERFLOW
for integer

* src/tosixel.c: check integer overflow in 'map[pix * width + x] |= (1 <<
i);'

2019-08-29 Takatsugu Nokubi <takatsugu.nokubi@robotfund.co.jp>

* src/loader.c: check jpeg decoder error

* src/fromsixel.c: check size, fix issue #83

2019-08-01 Takatsugu Nokubi <takatsugu.nokubi@robotfund.co.jp>

* include/sixel.h.in, src/decoder.c: add limitation to width and height

2019-07-25 Takatsugu Nokubi <takatsugu.nokubi@robotfund.co.jp>

* src/fromsixel.c: position error check

2019-07-24 Takatsugu Nokubi <takatsugu.nokubi@robotfund.co.jp>

* src/fromsixel.c: prevent to access heap overflow

2019-07-23 Takatsugu Nokubi <takatsugu.nokubi@robotfund.co.jp>

* src/stb_image.h: assign default error message

2019-07-08 Takatsugu Nokubi <takatsugu.nokubi@robotfund.co.jp>

* src/allocator.c: Add malloc size check

* src/fromsixel.c: size check

2019-07-07 Takatsugu Nokubi <takatsugu.nokubi@robotfund.co.jp>

* src/status.c: no op when message is NULL

2018-08-06 Hayaki Saito <saitoha@me.com>

* src/stb_image.h: stb_image: fix for #76 POC h050. detect bad PSD file.

2018-08-05 Hayaki Saito <saitoha@me.com>

* src/stb_image.h: stb_image: fix for #76 POC h010. detect bad PSD file
which has fake size declaration in its image header

* src/stb_image.h: stb_image: fix for #76 POC h002. detect bad TGA file
which has fake size declaration in its image header

* src/fromgif.c: GIF loader: fix for #76 POC h001. don't believe image size
declared in the header, use actual size.
https://github.com/saitoha/libsixel/issues/76

2018-08-03 Hayaki Saito <saitoha@me.com>

* src/stb_image.h: Quickfix for issue #72: validate huffman code
https://github.com/saitoha/libsixel/issues/72

2018-08-02 Hayaki Saito <saitoha@me.com>

* src/fromgif.c: gif loader: add some comments

* src/fromgif.c: gif loader: check LZW code size (Issue #75)

2018-07-23 Hayaki Saito <saitoha@me.com>

* src/Makefile.am, src/Makefile.in: Amend travis build fixes again

* src/Makefile.am, src/Makefile.in: Amend fix for travis build

* src/Makefile.am, src/Makefile.in: Travis build fixes

* NEWS: Update NEWS

* README.md: Update README.md

* README.md: Update README.md

* README.md: Update README.md

* Makefile.in, README.md, aclocal.m4, compile, config.guess, config.sub,
configure, configure.ac, converters/Makefile.in, depcomp,
include/Makefile.in, install-sh, missing, package.json, py-compile,
python/Makefile.in, src/Makefile.in, tools/Makefile.in: Bump version 1.8.2

* NEWS: Update NEWS

* ChangeLog: Update ChangeLog

2018-06-10 Hayaki Saito <saitoha@me.com>

* converters/img2sixel.1: Fix a typo: a_dither -> x_dither(issue #66)
Expand Down
41 changes: 41 additions & 0 deletions NEWS
View file
Expand Up @@ -2,6 +2,47 @@
------------------------------
What's new in libsixel-1.8 ?
------------------------------

* Security fix for CVE-2018-19757 (#79), NULL pointer dereference problem,
reported by @nluedtke and fixed by @knok (#91, #94).

* Security fix for CVE-2018-19762 (#81), heap-based buffer overflow problem,
reported by @nluedtke and fixed by @knok (#92).

* Security fix for CVE-2018-19756 (#80), heap-based buffer over-read problem,
reported by @nluedtke and fixed by @knok (#93).

* Security fix for CVE-2018-19763 (#82), heap-based buffer over-read problem,
reported by @nluedtke and fixed by @knok (#95).

* Security fix for CVE-2018-19761, illegal address access, fixed by @knok (#96).

* Security fix for CVE-2018-19759, heap-based buffer over-read problem, fixed by @knok (#98).

* Security fix for CVE-2018-3753 (#83), infinite loop problem,
reported by @cool-tomato and fixed by @knok (#99).

* Security fix for CVE-2018-19759 (#102),
heap-based buffer over-read that will cause a denial of service.
reported and fixed by @YourButterfly. (#106)

* Security fix for CVE-2019-19635 (#103), heap-based buffer overflow,
reported and fixed by @YourButterfly. (#106)

* Security fix for CVE-2019-19636 (#104) and CVE-2019-19637 (#105), integer overflow problem.
reported and fixed by @YourButterfly. (#106)

* gif loader: check LZW code size (Issue #75), Thanks to @HongxuChen.
https://github.com/saitoha/libsixel/commit/7808a06b88c11dbc502318cdd51fa374f8cd47ee

* core: Fix a global-buffer-overflow problem (Issue #72), Thanks to @fgeek.
https://github.com/saitoha/libsixel/commit/c868b59ec89bdb24c42a0de89e5319a989076c66

* core: Fix unexpected hangs/performance issues (Issue #76), Thanks to @HongxuChen.
https://github.com/saitoha/libsixel/commit/88561b7a810017b91d26b6273323dde4b6f9b273
https://github.com/saitoha/libsixel/commit/2d3d9ffe8ab886b7bc670fd896d63c628436cc66
https://github.com/saitoha/libsixel/commit/c9363cd1d5929e1d721af9f09633061dfa8152fe

* core: Upgrade stb_image to 2.19.

* core: Introduce new dithering method, a_dither / x_dither (http://pippin.gimp.org/a_dither/).
Expand Down
53 changes: 52 additions & 1 deletion README.md
View file
Expand Up @@ -299,6 +299,18 @@ $ xterm -xrm "XTerm*decTerminalID: vt340" -xrm "XTerm*numColorRegisters: 256"
- cancer
[https://github.com/meh/cancer/](https://github.com/meh/cancer)

- wezterm
[https://github.com/wez/wezterm](https://github.com/wez/wezterm)

- aminal
[https://github.com/liamg/aminal](https://github.com/liamg/aminal)

- iTerm2 (>= 3.0.0)
[https://gitlab.com/gnachman/iterm2](https://gitlab.com/gnachman/iterm2)

- st-sixel
[https://github.com/galatolofederico/st-sixel](https://github.com/galatolofederico/st-sixel)


## Install

Expand All @@ -309,7 +321,7 @@ You can install libsixel via the following package systems.
- [FreeBSD ports](http://portsmon.freebsd.org/portoverview.py?category=graphics&portname=libsixel)
- [DPorts](https://github.com/DragonFlyBSD/DPorts/tree/master/graphics/libsixel)
- [pkgsrc](http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/graphics/libsixel/)
- [Homebrew tap](https://github.com/aki017/homebrew-sixel)
- [Homebrew](https://formulae.brew.sh/formula/libsixel)
- [yacp](https://github.com/fd00/yacp/tree/master/libsixel)
- [Debian](https://packages.debian.org/search?searchon=names&keywords=libsixel)
- [AUR](https://aur.archlinux.org/packages/libsixel-git/)
Expand Down Expand Up @@ -1044,6 +1056,12 @@ The MIT License (MIT)
- [@turenar](https://github.com/turenar/)
- [@mame](https://github.com/mame/)
- [@hodefoting](https://github.com/hodefoting/)
- [@fCorleone](@https://github.com/fCorleone)
- [@fgeek](https://github.com/fgeek/)
- [@HongxuChen](https://github.com/HongxuChen/)
- [@YourButterfly](https://github.com/YourButterfly/)
- [@nluedtke](https://github.com/nluedtke/)
- [@cool-tomato](https://github.com/cool-tomato/)
## Contributing
Expand Down Expand Up @@ -1459,3 +1477,36 @@ We are greatly inspired by the quality of ImageMagick and added some resampling
- [gr framework](http://gr-framework.org/)
- [o2sh/onefetch](https://github.com/o2sh/onefetch)
- [lesnitsky/sixel-decoder](https://github.com/lesnitsky/sixel-decoder)
- [unhappychoice/irasutoya-cli](https://github.com/unhappychoice/irasutoya-cli)
- [ushitora-anqou/tinysixel](https://github.com/ushitora-anqou/tinysixel)
- [adzierzanowski/timg](https://github.com/adzierzanowski/timg)
- [SAT1226/Minase](https://github.com/SAT1226/Minase)
- [danr/neptyne](https://github.com/danr/neptyne)
- [klamonte/jexer](https://github.com/klamonte/jexer)
- [ar90n/teimpy](https://github.com/ar90n/teimpy)
- [fastai](https://github.com/fastai/fastai)
- [coderobe/crixel](https://github.com/coderobe/crixel)
- [itchyny/mkrg](https://github.com/itchyny/mkrg)
- [tshort/SixelTerm.jl](https://github.com/tshort/SixelTerm.jl)
- [dsanson/termpdf](https://github.com/dsanson/termpdf)
- [otiai10/amesh](https://github.com/otiai10/amesh)
- [hpjansson/chafa](https://github.com/hpjansson/chafa)
- [m-j-w/TerminalGraphics.jl](https://github.com/m-j-w/TerminalGraphics.jl)

0 comments on commit 9d9d186

Please sign in to comment.