Allow empty output parameters in get_serverportfp_from_filename()

[claws.git] / src / common / utils.c

diff --git a/src/common/utils.c b/src/common/utils.c
index 2e646ba1b48ca232d8fd61fe388ed59286dea6ce..a815c48bb8f1e6fadc58f716426ef3de90595b2c 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -4652,17 +4652,27 @@ gboolean get_serverportfp_from_filename(const gchar *str, gchar **server, gchar
                return FALSE;
        }
 
-       *server = g_strndup(str, dotport_pos - str);
+       if (server != NULL)
+               *server = g_strndup(str, dotport_pos - str);
        if (dotfp_pos) {
-               *port = g_strndup(dotport_pos + 1, dotfp_pos - dotport_pos - 1);
-               *fp = g_strndup(dotfp_pos + 1, dotcert_pos - dotfp_pos - 1);
+               if (port != NULL)
+                       *port = g_strndup(dotport_pos + 1, dotfp_pos - dotport_pos - 1);
+               if (fp != NULL)
+                       *fp = g_strndup(dotfp_pos + 1, dotcert_pos - dotfp_pos - 1);
        } else {
-               *port = g_strndup(dotport_pos + 1, dotcert_pos - dotport_pos - 1);
-               *fp = NULL;
+               if (port != NULL)
+                       *port = g_strndup(dotport_pos + 1, dotcert_pos - dotport_pos - 1);
+               if (fp != NULL)
+                       *fp = NULL;
        }
 
-       debug_print("filename='%s' => server='%s' port='%s' fp='%s'\n", str, *server, *port, *fp);
-       if (!*server || !*port)
+       debug_print("filename='%s' => server='%s' port='%s' fp='%s'\n",
+                       str,
+                       (server ? *server : "(n/a)"),
+                       (port ? *port : "(n/a)"),
+                       (fp ? *fp : "(n/a)"));
+
+       if (!(server && *server) || !(port && *port))
                return FALSE;
        else
                return TRUE;