diff options
| author | author Timo Teräs timo.teras@iki.fi 1442826138 +0300 <author Timo Teräs timo.teras@iki.fi 1442826138 +0300> | 2015-09-21 12:02:18 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2015-09-21 14:22:41 +0300 |
| commit | bffeca85f0d7cf485aeabb17dd0d40735fe2b2ee (patch) | |
| tree | 1b554c92454930300c19e392352193cdd683c208 /main/strongswan/0002-host-Properly-handle-NULL-in-host_create_from_string.patch | |
| parent | 79d8c05b7c382123dd04bd4dfb7ed7472d87c5d7 (diff) | |
| download | aports-bffeca85f0d7cf485aeabb17dd0d40735fe2b2ee.tar.bz2 aports-bffeca85f0d7cf485aeabb17dd0d40735fe2b2ee.tar.xz | |
main/strongswan: upgrade to 5.3.3
remove upstreamed patches; rebase the rest
Diffstat (limited to 'main/strongswan/0002-host-Properly-handle-NULL-in-host_create_from_string.patch')
| -rw-r--r-- | main/strongswan/0002-host-Properly-handle-NULL-in-host_create_from_string.patch | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/main/strongswan/0002-host-Properly-handle-NULL-in-host_create_from_string.patch b/main/strongswan/0002-host-Properly-handle-NULL-in-host_create_from_string.patch deleted file mode 100644 index ff79e322ec..0000000000 --- a/main/strongswan/0002-host-Properly-handle-NULL-in-host_create_from_string.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 65579569adfa0e2c9602ee250f4554169ba5a87d Mon Sep 17 00:00:00 2001 -From: Tobias Brunner <tobias@strongswan.org> -Date: Thu, 11 Jun 2015 15:07:07 +0200 -Subject: [PATCH] host: Properly handle NULL in - host_create_from_string[_and_family] - ---- - src/libstrongswan/networking/host.c | 4 ++++ - src/libstrongswan/tests/suites/test_host.c | 6 ++++++ - 2 files changed, 10 insertions(+) - -diff --git a/src/libstrongswan/networking/host.c b/src/libstrongswan/networking/host.c -index 07da3ef..2e464b0 100644 ---- a/src/libstrongswan/networking/host.c -+++ b/src/libstrongswan/networking/host.c -@@ -354,6 +354,10 @@ host_t *host_create_from_string_and_family(char *string, int family, - struct sockaddr_in6 v6; - } addr; - -+ if (!string) -+ { -+ return NULL; -+ } - if (streq(string, "%any")) - { - return host_create_any_port(family ? family : AF_INET, port); -diff --git a/src/libstrongswan/tests/suites/test_host.c b/src/libstrongswan/tests/suites/test_host.c -index 7161b2c..5cb8013 100644 ---- a/src/libstrongswan/tests/suites/test_host.c -+++ b/src/libstrongswan/tests/suites/test_host.c -@@ -104,6 +104,9 @@ START_TEST(test_create_from_string_v4) - { - host_t *host; - -+ host = host_create_from_string(NULL, 500); -+ ck_assert(!host); -+ - host = host_create_from_string("%any", 500); - verify_any(host, AF_INET, 500); - host->destroy(host); -@@ -196,6 +199,7 @@ static void test_create_from_string_and_family_addr(char *string, chunk_t addr, - - START_TEST(test_create_from_string_and_family_v4) - { -+ test_create_from_string_and_family_any(NULL, AF_INET, AF_UNSPEC); - test_create_from_string_and_family_any("%any", AF_INET, AF_INET); - test_create_from_string_and_family_any("%any4", AF_INET, AF_INET); - test_create_from_string_and_family_any("0.0.0.0", AF_INET, AF_INET); -@@ -210,6 +214,7 @@ END_TEST - - START_TEST(test_create_from_string_and_family_v6) - { -+ test_create_from_string_and_family_any(NULL, AF_INET6, AF_UNSPEC); - test_create_from_string_and_family_any("%any", AF_INET6, AF_INET6); - test_create_from_string_and_family_any("%any6", AF_INET6, AF_INET6); - test_create_from_string_and_family_any("::", AF_INET6, AF_INET6); -@@ -224,6 +229,7 @@ END_TEST - - START_TEST(test_create_from_string_and_family_other) - { -+ test_create_from_string_and_family_any(NULL, AF_UNSPEC, AF_UNSPEC); - test_create_from_string_and_family_any("%any", AF_UNSPEC, AF_INET); - test_create_from_string_and_family_any("%any4", AF_UNSPEC, AF_INET); - test_create_from_string_and_family_any("0.0.0.0", AF_UNSPEC, AF_INET); --- -2.4.6 - |