head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.96 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.94 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.92 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.90 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.88 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.86 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.84 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.82 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.80 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.78 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.76 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.74 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.72 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.70 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.68 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.66 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.64 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.62 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.60 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.58 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.56 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.54 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.52 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.48 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.28 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.50 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.46 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.44 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.42 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.40 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.38 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.36 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.34 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.32 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.30 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.26 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.24 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.22 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.20 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.18 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.16 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.14 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.12 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.10 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.8 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.6 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.4 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.2 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.2.0.6 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.4 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.2 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.1.0.76 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.74 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.72 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.70 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.68 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.66 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.64 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.62 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.60 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.58 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.56 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.54 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.52 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.50 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.48 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.46 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.44 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.42 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.40 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.38 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.36 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.34 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.32 pkgsrc-2008Q1:1.1.0.30 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.28 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.26 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.24 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.22 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.20 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.18 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.16 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.14 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.12 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.10 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.8 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.6 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.4 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.2; locks; strict; comment @# @; 1.4 date 2014.05.30.11.34.01; author joerg; state Exp; branches; next 1.3; commitid o26XJxwH7FMbtyCx; 1.3 date 2014.05.22.11.50.41; author obache; state Exp; branches; next 1.2; commitid Cw6y49SaUxaBOwBx; 1.2 date 2013.08.17.11.15.58; author joerg; state Exp; branches; next 1.1; commitid 7tYHOi8ZIhhZyN1x; 1.1 date 2004.12.10.09.30.42; author salo; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2004.12.10.09.30.42; author salo; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2004.12.13.18.03.27; author salo; state Exp; branches; next ; desc @@ 1.4 log @Fix build of imlib-gtk by adding the needed argument for DGifCloseFile. @ text @$NetBSD: patch-ak,v 1.3 2014/05/22 11:50:41 obache Exp $ * Fixes build with giflib>=5 --- gdk_imlib/io-gif.c.orig 2002-03-04 17:06:29.000000000 +0000 +++ gdk_imlib/io-gif.c @@@@ -10,6 +10,16 @@@@ unsigned char loader_gif (FILE *f, int * #else #include +static void +PrintGifError(int ErrorCode) { + char *Err = GifErrorString(ErrorCode); + + if (Err != NULL) + fprintf(stderr, "GIF-LIB error: %s.\n", Err); + else + fprintf(stderr, "GIF-LIB undefined error %d.\n", ErrorCode); +} + unsigned char * loader_gif(FILE *f, int *w, int *h, int *t) { @@@@ -30,7 +40,7 @@@@ loader_gif(FILE *f, int *w, int *h, int fd = fileno(f); /* Apparently rewind(f) isn't sufficient */ lseek(fd, (long) 0, 0); - gif = DGifOpenFileHandle(fd); + gif = DGifOpenFileHandle(fd, NULL); transp = -1; data = NULL; @@@@ -43,14 +53,14 @@@@ loader_gif(FILE *f, int *w, int *h, int { if (DGifGetRecordType(gif, &rec) == GIF_ERROR) { - PrintGifError(); + PrintGifError(gif->Error); rec = TERMINATE_RECORD_TYPE; } if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done)) { if (DGifGetImageDesc(gif) == GIF_ERROR) { - PrintGifError(); + PrintGifError(gif->Error); rec = TERMINATE_RECORD_TYPE; } *w = gif->Image.Width; @@@@ -62,13 +72,13 @@@@ loader_gif(FILE *f, int *w, int *h, int rows = malloc(*h * sizeof(GifRowType *)); if (!rows) { - DGifCloseFile(gif); + DGifCloseFile(gif, NULL); return NULL; } data = _gdk_malloc_image(*w, *h); if (!data) { - DGifCloseFile(gif); + DGifCloseFile(gif, NULL); free(rows); return NULL; } @@@@ -79,7 +89,7 @@@@ loader_gif(FILE *f, int *w, int *h, int rows[i] = malloc(*w * sizeof(GifPixelType)); if (!rows[i]) { - DGifCloseFile(gif); + DGifCloseFile(gif, NULL); for (i = 0; i < *h; i++) if (rows[i]) free(rows[i]); @@@@ -168,7 +178,7 @@@@ loader_gif(FILE *f, int *w, int *h, int } } } - DGifCloseFile(gif); + DGifCloseFile(gif, NULL); for (i = 0; i < *h; i++) free(rows[i]); free(rows); @ 1.3 log @Fixes build with giflib>=5.1, and fixes buges introduced as giflib-5.0 support. @ text @d1 1 a1 1 $NetBSD: patch-ak,v 1.2 2013/08/17 11:15:58 joerg Exp $ d50 34 @ 1.2 log @Fix build with new giflib. @ text @d1 3 a3 1 $NetBSD: patch-ak,v 1.1 2004/12/10 09:30:42 salo Exp $ a23 9 @@@@ -22,7 +32,7 @@@@ loader_gif(FILE *f, int *w, int *h, int int intoffset[] = {0, 4, 2, 1}; int intjump[] = {8, 8, 4, 2}; int istransp, transp; - int fd; + int fd, giferror = 0; done = 0; istransp = 0; d29 1 a29 1 + gif = DGifOpenFileHandle(fd, &giferror); d38 1 a38 1 + PrintGifError(giferror); d46 1 a46 1 + PrintGifError(giferror); @ 1.1 log @Bump PKGREVISION, security fix: "Multiple buffer overflows in imlib 1.9.14 and earlier, which is used by gkrellm and several window managers, allow remote attackers to execute arbitrary code via certain image files." (1.9.15 is also affected) http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-1026 Patch from Pavel Kankovsky. @ text @d1 1 a1 1 $NetBSD$ d3 52 a54 3 --- gdk_imlib/io-gif.c.orig 2002-03-04 18:06:29.000000000 +0100 +++ gdk_imlib/io-gif.c 2004-12-10 10:00:56.000000000 +0100 @@@@ -55,7 +55,7 @@@@ a56 6 *h = gif->Image.Height; - if(*h > 32767 || *w > 32767) + if(*h <= 0 || *h > 32767 || *w <= 0 || *w > 32767) { return NULL; } @ 1.1.2.1 log @file patch-ak was added on branch pkgsrc-2004Q3 on 2004-12-10 09:30:42 +0000 @ text @d1 13 @ 1.1.2.2 log @Pullup ticket 171 - requested by Havard Eidnes security fix for imlib Module Name: pkgsrc Committed By: tron Date: Sat Nov 27 08:09:38 UTC 2004 Modified Files: pkgsrc/graphics/imlib: Makefile Log Message: Remove me as maintainer of this package. --- Module Name: pkgsrc Committed By: adam Date: Fri Dec 3 13:42:47 UTC 2004 Modified Files: pkgsrc/graphics/imlib: Makefile distinfo pkgsrc/graphics/imlib/patches: patch-ag patch-ah Log Message: Changes 1.9.15: * Minor bug fixes --- Module Name: pkgsrc Committed By: salo Date: Fri Dec 10 09:30:42 UTC 2004 Modified Files: pkgsrc/graphics/imlib: Makefile buildlink3.mk distinfo pkgsrc/graphics/imlib/patches: patch-ab patch-ai Added Files: pkgsrc/graphics/imlib/patches: patch-aj patch-ak patch-al patch-am patch-an patch-ao Log Message: Bump PKGREVISION, security fix: "Multiple buffer overflows in imlib 1.9.14 and earlier, which is used by gkrellm and several window managers, allow remote attackers to execute arbitrary code via certain image files." (1.9.15 is also affected) http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-1026 Patch from Pavel Kankovsky. @ text @a0 13 $NetBSD: patch-ak,v 1.1.2.1 2004/12/13 18:03:27 salo Exp $ --- gdk_imlib/io-gif.c.orig 2002-03-04 18:06:29.000000000 +0100 +++ gdk_imlib/io-gif.c 2004-12-10 10:00:56.000000000 +0100 @@@@ -55,7 +55,7 @@@@ } *w = gif->Image.Width; *h = gif->Image.Height; - if(*h > 32767 || *w > 32767) + if(*h <= 0 || *h > 32767 || *w <= 0 || *w > 32767) { return NULL; } @