[Pkg-wmaker-commits] [wmbubble] 41/207: Fix segfault if you never xrdb'd

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmbubble.

commit d8901e70f1b87a1e7b3a5815e814acc2fce79229
Author: Robert Jacobs <rnjacobs at mit.edu>
Date:   Fri Jul 29 19:54:39 2011 -0700

    Fix segfault if you never xrdb'd
---
 bubblemon.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bubblemon.c b/bubblemon.c
index 439caa2..d736f79 100644
--- a/bubblemon.c
+++ b/bubblemon.c
@@ -344,6 +344,8 @@ int main(int argc, char **argv) {
 	bm.xim = initwmX11pixmap(argc,argv);
 	XrmInitialize();
 	x_resources_as_string = XResourceManagerString(wmxp_display);
+	if (x_resources_as_string == NULL)
+		x_resources_as_string = "";
 	x_resource_db = XrmGetStringDatabase(x_resources_as_string);
 	XrmParseCommand(&x_resource_db, x_resource_options, 
 	                sizeof(x_resource_options)/sizeof(x_resource_options[0]), 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbubble.git