summaryrefslogtreecommitdiffstats
path: root/x11vnc/solid.c
diff options
context:
space:
mode:
authorrunge <runge>2007-03-13 23:06:38 +0000
committerrunge <runge>2007-03-13 23:06:38 +0000
commit15f792bc2185d9317b0a35855b15759520877ee9 (patch)
tree0435ffea43b1208ba1b53fba92f503e2d7a950f1 /x11vnc/solid.c
parent0d4870c0a0da2680d60cd2b91b0541af2558d640 (diff)
downloadlibtdevnc-15f792bc2185d9317b0a35855b15759520877ee9.tar.gz
libtdevnc-15f792bc2185d9317b0a35855b15759520877ee9.zip
x11vnc: fix crash for kde dcop. limit ncache beta tester to 96MB viewers.
Diffstat (limited to 'x11vnc/solid.c')
-rw-r--r--x11vnc/solid.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/x11vnc/solid.c b/x11vnc/solid.c
index 9fb2562..e1b7049 100644
--- a/x11vnc/solid.c
+++ b/x11vnc/solid.c
@@ -611,26 +611,27 @@ static void solid_gnome(char *color) {
}
static char *dcop_session(void) {
+ char *empty = strdup("");
#if NO_X11
- RAWFB_RET("");
- return "";
+ RAWFB_RET(empty);
+ return empty;
#else
char list_sessions[] = "dcop --user '%s' --list-sessions";
int len;
char *cmd, *host, *user = NULL;
char *out, *p, *ds, *dsn = NULL, *sess = NULL, *sess2 = NULL;
- RAWFB_RET("");
+ RAWFB_RET(empty);
if (getenv("SESSION_MANAGER")) {
- return "";
+ return empty;
}
user = get_user_name();
if (strstr(user, "'") != NULL) {
rfbLog("invalid user: %s\n", user);
free(user);
- return "";
+ return empty;
}
len = strlen(list_sessions) + strlen(user) + 1;