diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-09-12 08:30:18 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-09-12 08:30:18 +0800 |
| commit | f38fa284229e9532be1da433fc6d3d7e798172e4 (patch) | |
| tree | c0aba71494b8da7c45cd6793485bdb1a1ab2787f | |
| parent | 381da41b3aefdd70b32a6c320725f86db8ce215c (diff) | |
| download | marcuscom-ports-f38fa284229e9532be1da433fc6d3d7e798172e4.tar marcuscom-ports-f38fa284229e9532be1da433fc6d3d7e798172e4.tar.gz marcuscom-ports-f38fa284229e9532be1da433fc6d3d7e798172e4.tar.bz2 marcuscom-ports-f38fa284229e9532be1da433fc6d3d7e798172e4.tar.lz marcuscom-ports-f38fa284229e9532be1da433fc6d3d7e798172e4.tar.xz marcuscom-ports-f38fa284229e9532be1da433fc6d3d7e798172e4.tar.zst marcuscom-ports-f38fa284229e9532be1da433fc6d3d7e798172e4.zip | |
Fix an abort crash due to a race condition. This crash seems quite
prevalent on FreeBSD, and really makes using help difficult. See
http://bugzilla.gnome.org/show_bug.cgi?id=551757 for more details.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11523 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | x11/yelp/Makefile | 3 | ||||
| -rw-r--r-- | x11/yelp/files/patch-src_yelp-document.c | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile index f09b808a1..e038a60b1 100644 --- a/x11/yelp/Makefile +++ b/x11/yelp/Makefile @@ -3,11 +3,12 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/yelp/Makefile,v 1.126 2008/08/21 20:53:19 mezz Exp $ +# $MCom: ports/x11/yelp/Makefile,v 1.127 2008/09/02 11:00:11 kwm Exp $ # PORTNAME= yelp PORTVERSION= 2.23.91 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/yelp/files/patch-src_yelp-document.c b/x11/yelp/files/patch-src_yelp-document.c new file mode 100644 index 000000000..a3dd9289d --- /dev/null +++ b/x11/yelp/files/patch-src_yelp-document.c @@ -0,0 +1,16 @@ +--- src/yelp-document.c.orig 2008-09-11 20:20:59.000000000 -0400 ++++ src/yelp-document.c 2008-09-11 20:20:40.000000000 -0400 +@@ -748,6 +749,13 @@ request_idle_final (YelpDocument *docume + priv = document->priv; + + g_mutex_lock (priv->mutex); ++ ++ if (priv->reqs_pending == NULL) { ++ /* ++ Time to bail as we shouldn't be here anyway. ++ */ ++ return FALSE; ++ } + + for (cur = priv->reqs_pending; cur; cur = cur->next) { + request = cur->data; |