Forbid clients from creating or referencing views with reserved ID 0.

3 files changed, 8 insertions, 4 deletions

diff --git a/src/comm.c b/src/comm.c
index 2ae22d2..06ca63b 100644
--- a/src/comm.c
+++ b/src/comm.c
@@ -90,7 +90,7 @@ comm_create(struct client *c, struct buffer *b, struct lin_message *m)
     if (v)
 	FD_LOG(1, "Warning: view %x already exists.\n", m->view);
     else {
-	v = view_new(c, b, m->view, 0);
+	v = view_new(c, b, m->view, VIEW_FLAGS_CLIENT);
 	if (!v) {
 	    FD_LOG(0, "Failed to create view!\n");
 	    return;
diff --git a/src/view.c b/src/view.c
index 029bf33..20b7475 100644
--- a/src/view.c
+++ b/src/view.c
@@ -75,9 +75,10 @@ view_lookup(struct client *c, int viewid)
 {
 	struct view *v;
 	
-	TAILQ_FOREACH(v, &c->views, client_next)
-		if (v->id == viewid)
-			return v;
+	if (viewid != 0)
+		TAILQ_FOREACH(v, &c->views, client_next)
+			if (v->id == viewid)
+				return v;
 
 	return NULL;
 
@@ -184,6 +185,8 @@ view_new(struct client *c, struct buffer *b, int id, unsigned int flags)
 
 	if (c->num_views >= c->max_views)
 		return NULL;
+	if (flags == VIEW_FLAGS_CLIENT && id == 0)
+		return NULL;
 
 	/* create subsurface */
 	if (b->bsurface->GetSubSurface(b->bsurface, NULL, &vsurf) != DFB_OK)
diff --git a/src/view.h b/src/view.h
index a8f10e1..af68215 100644
--- a/src/view.h
+++ b/src/view.h
@@ -36,6 +36,7 @@
 
 #include "sys-queue.h"
 
+#define VIEW_FLAGS_CLIENT      0x1   /* view was created by a client  */
 #define VIEW_FLAGS_BACKGROUND  0x2   /* view is a background view     */
 #define VIEW_FLAGS_THUMBNAIL   0x4   /* view is a thumbnail view      */