Tue Jun 24 06:28:02 2014 UTC ()
Patch a pair of missing error checks. PKGREVISION -> 6


(dholland)
diff -r1.31 -r1.32 pkgsrc/wm/golem/Makefile
diff -r1.8 -r1.9 pkgsrc/wm/golem/distinfo
diff -r0 -r1.1 pkgsrc/wm/golem/patches/patch-plugins_pager_pager.c
cvs diff -r1.31 -r1.32 pkgsrc/wm/golem/Makefile (expand / switch to unified diff)

--- pkgsrc/wm/golem/Makefile 2012/10/23 10:24:14 1.31
+++ pkgsrc/wm/golem/Makefile 2014/06/24 06:28:02 1.32
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.31 2012/10/23 10:24:14 wiz Exp $ 1# $NetBSD: Makefile,v 1.32 2014/06/24 06:28:02 dholland Exp $
2# 2#
3 3
4DISTNAME= golem-0.0.5 4DISTNAME= golem-0.0.5
5PKGREVISION= 5 5PKGREVISION= 6
6CATEGORIES= wm 6CATEGORIES= wm
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=golem/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=golem/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://golem.sourceforge.net/ 10HOMEPAGE= http://golem.sourceforge.net/
11COMMENT= Fast and lightweight yet customizable window manager 11COMMENT= Fast and lightweight yet customizable window manager
12 12
13USE_TOOLS+= gmake yacc lex 13USE_TOOLS+= gmake yacc lex
14GNU_CONFIGURE= YES 14GNU_CONFIGURE= YES
15 15
16CONFIGURE_ARGS+= --enable-i18n 16CONFIGURE_ARGS+= --enable-i18n
17 17
18.include "../../mk/bsd.prefs.mk" 18.include "../../mk/bsd.prefs.mk"
cvs diff -r1.8 -r1.9 pkgsrc/wm/golem/distinfo (expand / switch to unified diff)

--- pkgsrc/wm/golem/distinfo 2012/04/16 04:04:29 1.8
+++ pkgsrc/wm/golem/distinfo 2014/06/24 06:28:02 1.9
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1$NetBSD: distinfo,v 1.8 2012/04/16 04:04:29 dholland Exp $ 1$NetBSD: distinfo,v 1.9 2014/06/24 06:28:02 dholland Exp $
2 2
3SHA1 (golem-0.0.5.tar.gz) = 5939acf109502a2f962e20fa933b31970fb2ed74 3SHA1 (golem-0.0.5.tar.gz) = 5939acf109502a2f962e20fa933b31970fb2ed74
4RMD160 (golem-0.0.5.tar.gz) = 845d67cc96fbf34aca99c50bdccf4c1afdafb7f1 4RMD160 (golem-0.0.5.tar.gz) = 845d67cc96fbf34aca99c50bdccf4c1afdafb7f1
5Size (golem-0.0.5.tar.gz) = 748348 bytes 5Size (golem-0.0.5.tar.gz) = 748348 bytes
6SHA1 (patch-aa) = 2c2bb75dce922316a3360cc4e0fdcfdc97209527 6SHA1 (patch-aa) = 2c2bb75dce922316a3360cc4e0fdcfdc97209527
7SHA1 (patch-ab) = 9b874fff5141aacf784b833f0bf5150883ad2255 7SHA1 (patch-ab) = 9b874fff5141aacf784b833f0bf5150883ad2255
8SHA1 (patch-ac) = c3e61f79f0783aaaa06723f53029a7b67b1a2a9c 8SHA1 (patch-ac) = c3e61f79f0783aaaa06723f53029a7b67b1a2a9c
9SHA1 (patch-ad) = ca2f91ea4587148543811729c8afc8e474b1c1ba 9SHA1 (patch-ad) = ca2f91ea4587148543811729c8afc8e474b1c1ba
10SHA1 (patch-ae) = 76ecf2c292a2d3af0a897a986e2a61c87dad4998 10SHA1 (patch-ae) = 76ecf2c292a2d3af0a897a986e2a61c87dad4998
11SHA1 (patch-af) = 3d74dacec56e4c953169300dd492ecdbb67d3302 11SHA1 (patch-af) = 3d74dacec56e4c953169300dd492ecdbb67d3302
12SHA1 (patch-ag) = 29b9e2068191a84d30224eb1103e68601a3da220 12SHA1 (patch-ag) = 29b9e2068191a84d30224eb1103e68601a3da220
13SHA1 (patch-ah) = a60ccac1bb4d818c7ac11c5acadd131e25f6803d 13SHA1 (patch-ah) = a60ccac1bb4d818c7ac11c5acadd131e25f6803d
14SHA1 (patch-ai) = 580b4cbccb7039b476a3469a63d1d888d86e0993 14SHA1 (patch-ai) = 580b4cbccb7039b476a3469a63d1d888d86e0993
15SHA1 (patch-aj) = 7e9df0996e972b174dfe833705219e937f11ab28 15SHA1 (patch-aj) = 7e9df0996e972b174dfe833705219e937f11ab28
 16SHA1 (patch-plugins_pager_pager.c) = 452d962e34132770a7ab1a6d2449a519a552c4b8
16SHA1 (patch-src_placement_c) = 938b6701ce8b86e3a1dc923f64acf1949a4ab006 17SHA1 (patch-src_placement_c) = 938b6701ce8b86e3a1dc923f64acf1949a4ab006
File Added: pkgsrc/wm/golem/patches/patch-plugins_pager_pager.c
$NetBSD: patch-plugins_pager_pager.c,v 1.1 2014/06/24 06:28:02 dholland Exp $

Add some missing error checks. This might fix a segv macallan was seeing.

--- plugins/pager/pager.c~	2001-12-06 04:53:28.000000000 +0000
+++ plugins/pager/pager.c
@@ -457,6 +457,10 @@ int start() {
 		 */
 		if (pager_selpixmap) {
 			image = image_frompixmap(pager_selpixmap, screen);
+			if (!image) {
+				/* XXX I assume this leaks memory */
+				return PLUGIN_UNLOAD;
+			}
 			thisscr->sel_img = image_scale(image,
 				pager_ratio * screen->width,
 				pager_ratio * screen->height);
@@ -464,6 +468,10 @@ int start() {
 		}
 		if (pager_nonselpixmap) {
 			image = image_frompixmap(pager_nonselpixmap, screen);
+			if (!image) {
+				/* XXX I assume this leaks memory */
+				return PLUGIN_UNLOAD;
+			}
 			thisscr->nonsel_img = image_scale(image,
 				pager_ratio * screen->width,
 				pager_ratio * screen->height);