Demos (master): glxinfo: fix issues in visual_drawable_type()

[Brian Paul]

Module: Demos
Branch: master
Commit: 738551f88a0a06956a6daeb33c99420d951f475f
URL:    http://cgit.freedesktop.org/mesa/demos/commit/?id=738551f88a0a06956a6daeb33c99420d951f475f

Author: sagawa <sagawa.aki+fdtbugs at gmail.com>
Date:   Fri May  6 11:52:00 2011 -0600

glxinfo: fix issues in visual_drawable_type()

Fixes bug http://bugs.freedesktop.org/show_bug.cgi?id=36959

Signed-off-by: Brian Paul <brianp at vmware.com>

---

 src/xdemos/glxinfo.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/xdemos/glxinfo.c b/src/xdemos/glxinfo.c
index 28a1d28..b33b180 100644
--- a/src/xdemos/glxinfo.c
+++ b/src/xdemos/glxinfo.c
@@ -681,13 +681,15 @@ visual_drawable_type(int type)
    };
    int i;
 
+   strcpy(buffer, "(none)");
    p = buffer;
    for (i = 0; i < 3; i++) {
-      if (p > buffer)
-	 *p++ = ',';
-      if (type & bits[i].bit)
-	 strcpy(p, bits[i].name);
-      p += strlen(bits[i].name);
+      if (type & bits[i].bit) {
+         if (p > buffer)
+            *p++ = ',';
+         strcpy(p, bits[i].name);
+         p += strlen(bits[i].name);
+      }
    }
 
    return buffer;