From: Pierre Ossman <ossman@cendio.se>
Date: Mon, 10 Aug 2015 12:03:16 +0000 (+0200)
Subject: Show error dialog when ACL pattern isn't accepted
X-Git-Tag: v1.5.90~48
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cd87317f6debfe4a6157e3601f86e3f0b3526683;p=tigervnc.git

Show error dialog when ACL pattern isn't accepted
---

diff --git a/win/vncconfig/Connections.h b/win/vncconfig/Connections.h
index 6176f3dc..3d3c06cb 100644
--- a/win/vncconfig/Connections.h
+++ b/win/vncconfig/Connections.h
@@ -73,8 +73,13 @@ namespace rfb {
         newPat.buf[1] = 0;
         _tcscat(newPat.buf, host.buf);
 
-        network::TcpFilter::Pattern pat(network::TcpFilter::parsePattern(CStr(newPat.buf)));
-        pattern.replaceBuf(TCharArray(network::TcpFilter::patternToStr(pat)).takeBuf());
+        try {
+          network::TcpFilter::Pattern pat(network::TcpFilter::parsePattern(CStr(newPat.buf)));
+          pattern.replaceBuf(TCharArray(network::TcpFilter::patternToStr(pat)).takeBuf());
+        } catch(rdr::Exception e) {
+          MsgBox(NULL, TStr(e.str()), MB_ICONEXCLAMATION | MB_OK);
+          return false;
+        }
         return true;
       }
       const TCHAR* getPattern() {return pattern.buf;}