New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reset magick_list_initialized when needed #826

Merged
merged 1 commit into from Oct 3, 2017

Conversation

Projects
None yet
2 participants
@Schnouki
Contributor

Schnouki commented Oct 3, 2017

Prerequisites

  • I have written a descriptive pull-request title
  • I have verified that there are no overlapping pull-requests open
  • I have verified that I am following the existing coding patterns and practices as demonstrated in the repository.

Description

This fixes #825 by resetting the magick_list_initialized boolean when needed.
Failure to do so makes it impossible to re-init magick_list as it is already
marked as initialized even if it was destroyed.

Reset magick_list_initialized when needed
Failure to do so makes it impossible to re-init magick_list as it is already
marked as initialized even if it was destroyed.

Fixes #825.

@Schnouki Schnouki referenced this pull request Oct 3, 2017

Merged

Reset magick_list_initialized when needed #827

3 of 3 tasks complete

@dlemstra dlemstra merged commit 9c01298 into ImageMagick:ImageMagick-6 Oct 3, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

netbsd-srcmastr pushed a commit to NetBSD/pkgsrc that referenced this pull request Oct 10, 2017

tez
ImageMagick: update to 7.0.7.7
2017-10-07  7.0.7-7 Cristy  <quetzlzacatenango@image...>
  * Release ImageMagick version 7.0.7-7, GIT revision 21432:29003eeed:20171007.

2017-10-06  7.0.7-7 Cristy  <quetzlzacatenango@image...>
  * Correct handling of GIF transparency (reference
    ImageMagick/ImageMagick#831).

2017-10-04  7.0.7-6 Cristy  <quetzlzacatenango@image...>
  * Release ImageMagick version 7.0.7-6, GIT revision 21426:0a1cb507b:20171004.

2017-10-03  7.0.7-6 Cristy  <quetzlzacatenango@image...>
  * Reset the magick_list_initialized boolean when needed (reference
    ImageMagick/ImageMagick#826).
2017-10-02  7.0.7-6 Cristy  <quetzlzacatenango@image...>
  * Reset the magick_list_initialized boolean when needed (reference
    ImageMagick/ImageMagick#826).

2017-10-01  7.0.7-5 Cristy  <quetzlzacatenango@image...>
  * Release ImageMagick version 7.0.7-5, GIT revision 21382:3846f9d97:20171001.

2017-09-28  7.0.7-5 Cristy  <quetzlzacatenango@image...>
  * Fixed numerous memory leaks (reference
    https://github.com/ImageMagick/ImageMagick/issues).
  * Support URW-base35 fonts.

2017-09-26  7.0.7-5 Glenn Randers-Pehrson <glennrp@image...>
  * Removed "ping_preserve_iCCP=MagickTrue;" statement that was inadvertently
    added to coders/png.c (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=32771).

2017-09-23  7.0.7-4 Cristy  <quetzlzacatenango@image...>
  * Release ImageMagick version 7.0.7-4, GIT revision 21265:bdbc14590:20170923.

2017-09-23  7.0.7-4 Cristy  <quetzlzacatenango@image...>
  * Fixed numerous memory leaks (reference
    ImageMagick/ImageMagick#763).

2017-09-17  7.0.7-3 Cristy  <quetzlzacatenango@image...>
  * Release ImageMagick version 7.0.7-3, GIT revision 21202:6e6907ac7:20170917.

2017-09-17  7.0.7-3 ADLab of Venustech
  * Fixed numerous memory leaks (reference
    ImageMagick/ImageMagick#763).

2017-09-15  7.0.7-3 Glenn Randers-Pehrson <glennrp@image...>
  * Stop potential leaks in the JNG decoder (reference:
    ImageMagick/ImageMagick#760).
  * Maximum valid hour is 23, not 24, in the PNG tIME chunk, and maximum
    valid minute is 59, not 60.

@Schnouki Schnouki deleted the Schnouki:fix-825-im6 branch Oct 13, 2017

netbsd-srcmastr pushed a commit to NetBSD/pkgsrc that referenced this pull request Oct 22, 2017

tez
ImageMagick: update to 7.0.7.7
2017-10-07  7.0.7-7 Cristy  <quetzlzacatenango@image...>
  * Release ImageMagick version 7.0.7-7, GIT revision 21432:29003eeed:20171007.

2017-10-06  7.0.7-7 Cristy  <quetzlzacatenango@image...>
  * Correct handling of GIF transparency (reference
    ImageMagick/ImageMagick#831).

2017-10-04  7.0.7-6 Cristy  <quetzlzacatenango@image...>
  * Release ImageMagick version 7.0.7-6, GIT revision 21426:0a1cb507b:20171004.

2017-10-03  7.0.7-6 Cristy  <quetzlzacatenango@image...>
  * Reset the magick_list_initialized boolean when needed (reference
    ImageMagick/ImageMagick#826).
2017-10-02  7.0.7-6 Cristy  <quetzlzacatenango@image...>
  * Reset the magick_list_initialized boolean when needed (reference
    ImageMagick/ImageMagick#826).

2017-10-01  7.0.7-5 Cristy  <quetzlzacatenango@image...>
  * Release ImageMagick version 7.0.7-5, GIT revision 21382:3846f9d97:20171001.

2017-09-28  7.0.7-5 Cristy  <quetzlzacatenango@image...>
  * Fixed numerous memory leaks (reference
    https://github.com/ImageMagick/ImageMagick/issues).
  * Support URW-base35 fonts.

2017-09-26  7.0.7-5 Glenn Randers-Pehrson <glennrp@image...>
  * Removed "ping_preserve_iCCP=MagickTrue;" statement that was inadvertently
    added to coders/png.c (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=32771).

2017-09-23  7.0.7-4 Cristy  <quetzlzacatenango@image...>
  * Release ImageMagick version 7.0.7-4, GIT revision 21265:bdbc14590:20170923.

2017-09-23  7.0.7-4 Cristy  <quetzlzacatenango@image...>
  * Fixed numerous memory leaks (reference
    ImageMagick/ImageMagick#763).

2017-09-17  7.0.7-3 Cristy  <quetzlzacatenango@image...>
  * Release ImageMagick version 7.0.7-3, GIT revision 21202:6e6907ac7:20170917.

2017-09-17  7.0.7-3 ADLab of Venustech
  * Fixed numerous memory leaks (reference
    ImageMagick/ImageMagick#763).

2017-09-15  7.0.7-3 Glenn Randers-Pehrson <glennrp@image...>
  * Stop potential leaks in the JNG decoder (reference:
    ImageMagick/ImageMagick#760).
  * Maximum valid hour is 23, not 24, in the PNG tIME chunk, and maximum
    valid minute is 59, not 60.

netbsd-srcmastr pushed a commit to NetBSD/pkgsrc that referenced this pull request Oct 28, 2017

spz
Pullup ticket #5586 - requested by he
graphics/ImageMagick: security update

Revisions pulled up:
- graphics/ImageMagick/Makefile.common                          1.157
- graphics/ImageMagick/PLIST                                    1.98
- graphics/ImageMagick/distinfo                                 1.173

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	tez
   Date:		Tue Oct 10 19:47:50 UTC 2017

   Modified Files:
   	pkgsrc/graphics/ImageMagick: Makefile.common PLIST distinfo

   Log Message:
   ImageMagick: update to 7.0.7.7

   2017-10-07  7.0.7-7 Cristy  <quetzlzacatenango@image...>
     * Release ImageMagick version 7.0.7-7, GIT revision 21432:29003eeed:20171007.

   2017-10-06  7.0.7-7 Cristy  <quetzlzacatenango@image...>
     * Correct handling of GIF transparency (reference
       ImageMagick/ImageMagick#831).

   2017-10-04  7.0.7-6 Cristy  <quetzlzacatenango@image...>
     * Release ImageMagick version 7.0.7-6, GIT revision 21426:0a1cb507b:20171004.

   2017-10-03  7.0.7-6 Cristy  <quetzlzacatenango@image...>
     * Reset the magick_list_initialized boolean when needed (reference
       ImageMagick/ImageMagick#826).
   2017-10-02  7.0.7-6 Cristy  <quetzlzacatenango@image...>
     * Reset the magick_list_initialized boolean when needed (reference
       ImageMagick/ImageMagick#826).

   2017-10-01  7.0.7-5 Cristy  <quetzlzacatenango@image...>
     * Release ImageMagick version 7.0.7-5, GIT revision 21382:3846f9d97:20171001.

   2017-09-28  7.0.7-5 Cristy  <quetzlzacatenango@image...>
     * Fixed numerous memory leaks (reference
       https://github.com/ImageMagick/ImageMagick/issues).
     * Support URW-base35 fonts.

   2017-09-26  7.0.7-5 Glenn Randers-Pehrson <glennrp@image...>
     * Removed "ping_preserve_iCCP=MagickTrue;" statement that was inadvertently
       added to coders/png.c (reference
       http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t2771).

   2017-09-23  7.0.7-4 Cristy  <quetzlzacatenango@image...>
     * Release ImageMagick version 7.0.7-4, GIT revision 21265:bdbc14590:20170923.

   2017-09-23  7.0.7-4 Cristy  <quetzlzacatenango@image...>
     * Fixed numerous memory leaks (reference
       ImageMagick/ImageMagick#763).

   2017-09-17  7.0.7-3 Cristy  <quetzlzacatenango@image...>
     * Release ImageMagick version 7.0.7-3, GIT revision 21202:6e6907ac7:20170917.

   2017-09-17  7.0.7-3 ADLab of Venustech
     * Fixed numerous memory leaks (reference
       ImageMagick/ImageMagick#763).

   2017-09-15  7.0.7-3 Glenn Randers-Pehrson <glennrp@image...>
     * Stop potential leaks in the JNG decoder (reference:
       ImageMagick/ImageMagick#760).
     * Maximum valid hour is 23, not 24, in the PNG tIME chunk, and maximum
       valid minute is 59, not 60.


   To generate a diff of this commit:
   cvs rdiff -u -r1.156 -r1.157 pkgsrc/graphics/ImageMagick/Makefile.common
   cvs rdiff -u -r1.97 -r1.98 pkgsrc/graphics/ImageMagick/PLIST
   cvs rdiff -u -r1.172 -r1.173 pkgsrc/graphics/ImageMagick/distinfo
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment