commit c628ba44c1a98cdee6580587bc50380b6cbc46e2
author Pierre Ossman <ossman@cendio.se> Mon May 23 12:21:21 2011 +0000
committer Pierre Ossman <ossman@cendio.se> Mon May 23 12:21:21 2011 +0000
tree 9aa1b58bf0b1831218e77480a64909593ee38034
parent bf1f26417247c2b9c794b3a25507a5a20107deab

We need to be careful about feeding FLTK @:s when they will be used in a
label as that is a formatting character.


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4440 3789f03b-4d11-0410-bbf8-ca57d06f2519

vncviewer/UserDialog.cxx

diff --git a/vncviewer/UserDialog.cxx b/vncviewer/UserDialog.cxx
index e94ab71..0ac5009 100644
--- a/vncviewer/UserDialog.cxx
+++ b/vncviewer/UserDialog.cxx
@@ -34,6 +34,7 @@
 #include <rfb/Exception.h>
 
 #include "i18n.h"
+#include "fltk_layout.h"
 #include "parameters.h"
 #include "UserDialog.h"
 
@@ -137,6 +138,11 @@
 
 bool UserDialog::showMsgBox(int flags, const char* title, const char* text)
 {
+  char buffer[1024];
+
+  if (fltk_escape(text, buffer, sizeof(buffer)) >= sizeof(buffer))
+    return 0;
+
   // FLTK doesn't give us a flexible choice of the icon, so we ignore those
   // bits for now.
 
@@ -146,16 +152,16 @@
 
   switch (flags & 0xf) {
   case M_OKCANCEL:
-    return fl_choice(text, NULL, fl_ok, fl_cancel) == 1;
+    return fl_choice(buffer, NULL, fl_ok, fl_cancel) == 1;
   case M_YESNO:
-    return fl_choice(text, NULL, fl_yes, fl_no) == 1;
+    return fl_choice(buffer, NULL, fl_yes, fl_no) == 1;
   case M_OK:
   default:
     if (((flags & 0xf0) == M_ICONERROR) ||
         ((flags & 0xf0) == M_ICONWARNING))
-      fl_alert(text);
+      fl_alert(buffer);
     else
-      fl_message(text);
+      fl_message(buffer);
     return true;
   }
 

vncviewer/Viewport.cxx

diff --git a/vncviewer/Viewport.cxx b/vncviewer/Viewport.cxx
index 5b98d97..5b5f5bb 100644
--- a/vncviewer/Viewport.cxx
+++ b/vncviewer/Viewport.cxx
@@ -42,6 +42,7 @@
 #include "CConn.h"
 #include "OptionsDialog.h"
 #include "i18n.h"
+#include "fltk_layout.h"
 #include "parameters.h"
 #include "keysym2ucs.h"
 
@@ -575,6 +576,7 @@
 void Viewport::popupContextMenu()
 {
   const Fl_Menu_Item *m;
+  char buffer[1024];
 
   contextMenu->position(Fl::event_x(), Fl::event_y());
 
@@ -618,8 +620,10 @@
     OptionsDialog::showDialog();
     break;
   case ID_INFO:
-    fl_message_title(_("VNC connection info"));
-    fl_message(cc->connectionInfo());
+    if (fltk_escape(cc->connectionInfo(), buffer, sizeof(buffer)) < sizeof(buffer)) {
+      fl_message_title(_("VNC connection info"));
+      fl_message(buffer);
+    }
     break;
   case ID_ABOUT:
     about_vncviewer();

vncviewer/fltk_layout.h

diff --git a/vncviewer/fltk_layout.h b/vncviewer/fltk_layout.h
index 5119188..61dea21 100644
--- a/vncviewer/fltk_layout.h
+++ b/vncviewer/fltk_layout.h
@@ -33,6 +33,40 @@
     return (int)(len + 0.5f);
 }
 
+/* Escapes all @ in text as those have special meaning in labels */
+static inline int fltk_escape(const char *in, char *out, size_t maxlen)
+{
+    int len;
+
+    len = 0;
+
+    while (*in != '\0') {
+        if (*in == '@') {
+            if (maxlen >= 3) {
+                *out++ = '@';
+                *out++ = '@';
+                maxlen -= 2;
+            }
+
+            len += 2;
+        } else {
+            if (maxlen >= 2) {
+                *out++ = *in;
+                maxlen--;
+            }
+
+            len += 1;
+        }
+
+        in++;
+    }
+
+    if (maxlen)
+        *out = '\0';
+
+    return len;
+}
+
 /**** MARGINS ****/
 
 #define OUTER_MARGIN            10