Make strSplit() simpler and safer

Get rid of all the magical re-allocation and shuffling and instead just
return a new set of strings that is fully splitted. Will consume a bit
more memory, but is a lot safer to use as there is less confusion about
ownership of memory.

1 files changed, 5 insertions, 7 deletions

diff --git a/win/vncconfig/Connections.h b/win/vncconfig/Connections.h
index f9b66547..492525f3 100644
--- a/win/vncconfig/Connections.h
+++ b/win/vncconfig/Connections.h
@@ -100,13 +100,11 @@ namespace rfb {
         while (SendMessage(listBox, LB_GETCOUNT, 0, 0))
           SendMessage(listBox, LB_DELETESTRING, 0, 0);
 
-        CharArray tmp;
-        tmp.buf = strDup(hosts.getValueStr().c_str());
-        while (tmp.buf) {
-          CharArray first;
-          strSplit(tmp.buf, ',', &first.buf, &tmp.buf);
-          if (strlen(first.buf))
-            SendMessage(listBox, LB_ADDSTRING, 0, (LPARAM)first.buf);
+        std::vector<std::string> hostv;
+        hostv = strSplit(hosts, ',');
+        for (size_t i = 0; i < hostv.size(); i++) {
+          if (!hostv[i].empty())
+            SendMessage(listBox, LB_ADDSTRING, 0, (LPARAM)hostv[i].c_str());
         }
 
         onCommand(IDC_RFB_ENABLE, EN_CHANGE);