summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/plugins/irc/irc-message.c34
-rw-r--r--tests/unit/plugins/irc/test-irc-message.cpp14
2 files changed, 19 insertions, 29 deletions
diff --git a/src/plugins/irc/irc-message.c b/src/plugins/irc/irc-message.c
index b80a268d0..ceca9707f 100644
--- a/src/plugins/irc/irc-message.c
+++ b/src/plugins/irc/irc-message.c
@@ -634,31 +634,27 @@ irc_message_get_address_from_host (const char *host)
return NULL;
address[0] = '\0';
- if (host)
+
+ ptr_host = host;
+ pos_space = strchr (host, ' ');
+ if (pos_space)
{
- ptr_host = host;
- pos_space = strchr (host, ' ');
- if (pos_space)
+ if (pos_space - host < (int)sizeof (host2))
{
- if (pos_space - host < (int)sizeof (host2))
- {
- strncpy (host2, host, pos_space - host);
- host2[pos_space - host] = '\0';
- }
- else
- snprintf (host2, sizeof (host2), "%s", host);
- ptr_host = host2;
+ strncpy (host2, host, pos_space - host);
+ host2[pos_space - host] = '\0';
}
-
- if (ptr_host[0] == ':')
- ptr_host++;
- pos = strchr (ptr_host, '!');
- if (pos)
- snprintf (address, sizeof (address), "%s", pos + 1);
else
- snprintf (address, sizeof (address), "%s", ptr_host);
+ snprintf (host2, sizeof (host2), "%s", host);
+ ptr_host = host2;
}
+ if (ptr_host[0] == ':')
+ ptr_host++;
+ pos = strchr (ptr_host, '!');
+ if (pos)
+ snprintf (address, sizeof (address), "%s", pos + 1);
+
return address;
}
diff --git a/tests/unit/plugins/irc/test-irc-message.cpp b/tests/unit/plugins/irc/test-irc-message.cpp
index d8c1a5e73..25a0d33e8 100644
--- a/tests/unit/plugins/irc/test-irc-message.cpp
+++ b/tests/unit/plugins/irc/test-irc-message.cpp
@@ -912,19 +912,13 @@ TEST(IrcMessage, GetAddressFromHost)
{
POINTERS_EQUAL(NULL, irc_message_get_address_from_host (NULL));
STRCMP_EQUAL("", irc_message_get_address_from_host (""));
- STRCMP_EQUAL("host", irc_message_get_address_from_host ("host"));
- STRCMP_EQUAL("host", irc_message_get_address_from_host ("host "));
- STRCMP_EQUAL("host", irc_message_get_address_from_host ("host test"));
- STRCMP_EQUAL("host", irc_message_get_address_from_host (":host "));
+ STRCMP_EQUAL("", irc_message_get_address_from_host ("host"));
+ STRCMP_EQUAL("", irc_message_get_address_from_host ("host "));
+ STRCMP_EQUAL("", irc_message_get_address_from_host ("host test"));
+ STRCMP_EQUAL("", irc_message_get_address_from_host (":host "));
STRCMP_EQUAL("host", irc_message_get_address_from_host (":nick!host"));
STRCMP_EQUAL("user@host",
irc_message_get_address_from_host (":nick!user@host"));
- STRCMP_EQUAL("nick_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
- "x_64_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
- "xxxx_128_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
- "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
- "xxxxxxxxxxxx_25",
- irc_message_get_address_from_host (NICK_256_WITH_SPACE));
}
/*