diff options
| author | dholland <dholland@pkgsrc.org> | 2014-06-24 06:28:02 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2014-06-24 06:28:02 +0000 |
| commit | 98fa04e15fb2d9c7f760f82b3771915466be0960 (patch) | |
| tree | 3a06e1f1c8a8576b3818fca81a6e07379fcd288b | |
| parent | 7ceda127e12bc89d2da36914cdeea9362512d747 (diff) | |
| download | pkgsrc-98fa04e15fb2d9c7f760f82b3771915466be0960.tar.gz | |
Patch a pair of missing error checks. PKGREVISION -> 6
| -rw-r--r-- | wm/golem/Makefile | 4 | ||||
| -rw-r--r-- | wm/golem/distinfo | 3 | ||||
| -rw-r--r-- | wm/golem/patches/patch-plugins_pager_pager.c | 28 |
3 files changed, 32 insertions, 3 deletions
diff --git a/wm/golem/Makefile b/wm/golem/Makefile index a0c760aff89..698c3c5ae89 100644 --- a/wm/golem/Makefile +++ b/wm/golem/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.31 2012/10/23 10:24:14 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2014/06/24 06:28:02 dholland Exp $ # DISTNAME= golem-0.0.5 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=golem/} diff --git a/wm/golem/distinfo b/wm/golem/distinfo index 7b8288f930c..d3d1305f323 100644 --- a/wm/golem/distinfo +++ b/wm/golem/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2012/04/16 04:04:29 dholland Exp $ +$NetBSD: distinfo,v 1.9 2014/06/24 06:28:02 dholland Exp $ SHA1 (golem-0.0.5.tar.gz) = 5939acf109502a2f962e20fa933b31970fb2ed74 RMD160 (golem-0.0.5.tar.gz) = 845d67cc96fbf34aca99c50bdccf4c1afdafb7f1 @@ -13,4 +13,5 @@ SHA1 (patch-ag) = 29b9e2068191a84d30224eb1103e68601a3da220 SHA1 (patch-ah) = a60ccac1bb4d818c7ac11c5acadd131e25f6803d SHA1 (patch-ai) = 580b4cbccb7039b476a3469a63d1d888d86e0993 SHA1 (patch-aj) = 7e9df0996e972b174dfe833705219e937f11ab28 +SHA1 (patch-plugins_pager_pager.c) = 452d962e34132770a7ab1a6d2449a519a552c4b8 SHA1 (patch-src_placement_c) = 938b6701ce8b86e3a1dc923f64acf1949a4ab006 diff --git a/wm/golem/patches/patch-plugins_pager_pager.c b/wm/golem/patches/patch-plugins_pager_pager.c new file mode 100644 index 00000000000..3fc7941e496 --- /dev/null +++ b/wm/golem/patches/patch-plugins_pager_pager.c @@ -0,0 +1,28 @@ +$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); |