Changeset d26c3b950032d169b2d19dfccdf444256264c162

Timestamp:

09/10/09 05:37:41 (4 years ago)

Author:

Armin Burgmeier <armin@…>

git-author:

Armin Burgmeier <armin@arbur.net> / 2009-09-09T23:30:56Z-0400

Parents:

81f1f55f4c81c36b08fffb6d8123e7b0be1fdcd5

Children:

b483a11d3443e16937dd7c8586c1a068e68e6bbd

git-committer:

Armin Burgmeier <armin@arbur.net> / 2009-09-09T23:37:41Z-0400

Message:

remote-url-open: Made the UNIQUE_GOBBY_CONNECT case exception-safe

Files:

• ChangeLog (modified) (1 diff)
• code/window.cpp (modified) (5 diffs)

ChangeLog

@@ +1 @@
+2009-09-09  Armin Burgmeier  <armin@arbur.net>
+
+        * code/window.cpp (on_message_received): Don't leak the uris vector
+        when an exception is thrown.
+
 2009-09-09  Benjamin Herr  <ben@0x539.de>
 

code/window.cpp

@@ -241 +241 @@
 try
 {
+        struct uris_holder
+        {
+                uris_holder(gchar** uris): uris(uris) {}
+                ~uris_holder() { if(uris) g_strfreev(uris); }
+                operator gchar* const*() const { return uris; }
+
+                gchar** uris;
+
+        private:
+                uris_holder(const uris_holder&);
+                uris_holder& operator=(const uris_holder&);
+        };
+
         switch (command)
         {
@@ -250 +263 @@
         case UNIQUE_OPEN:
                 {
-                        gchar** uris = unique_message_data_get_uris(message);
-                        if (!uris || !uris[0])
+                        uris_holder uris(
+                                unique_message_data_get_uris(message));
+                        if(!uris || !uris[0])
                                 return UNIQUE_RESPONSE_FAIL;
                         if(uris[1]) // multiple files?
@@ -257 +271 @@
                                 TaskOpenMultiple* task =
                                         new TaskOpenMultiple(m_commands_file);
-                                for (const gchar* const* p = uris; *p; ++p)
+                                for(const gchar* const* p = uris; *p; ++p)
                                         task->add_file(*p);
                                 m_commands_file.set_task(task);
@@ -268 +282 @@
                                 m_commands_file.set_task(task);
                         }
-                        g_strfreev(uris);
                         return UNIQUE_RESPONSE_OK;
                 }
         case UNIQUE_GOBBY_CONNECT:
                 {
-                        gchar** uris = unique_message_data_get_uris(message);
+                        uris_holder uris(unique_message_data_get_uris(message));
                         if(!uris || !uris[0])
                                 return UNIQUE_RESPONSE_FAIL;
-                        // TODO: I do not have a very strong intuition that
-                        // this is not going to throw, ever. We should
-                        // probably handle that.
                         for(const gchar* const* p = uris; *p; ++p)
                         {
-                                if(!g_str_has_prefix(*p, "infinote://"))
-                                {
-                                        g_strfreev(uris);
+                                const gchar protocol[] = "infinote://";
+                                if(!g_str_has_prefix(*p, protocol))
                                         return UNIQUE_RESPONSE_FAIL;
-                                }
-                                connect_to_host(*p + sizeof("infinote://")-1);
+                                connect_to_host(*p + sizeof(protocol) - 1);
                         }
-                        g_strfreev(uris);
                         return UNIQUE_RESPONSE_OK;
                 }
@@ -294 +301 @@
                 return UNIQUE_RESPONSE_PASSTHROUGH;
         }
-} catch (...) {
+}
+// For example, connect_to_host might throw Glib::ThreadError
+catch(const Glib::Exception& error)
+{
+        // TODO: Do we want to show a dialog here?
+        g_warning("Failed to process IPC message: %s", error.what().c_str());
+        return UNIQUE_RESPONSE_FAIL;
+}
+catch (...)
+{
         g_assert_not_reached();
         return UNIQUE_RESPONSE_FAIL;