summaryrefslogtreecommitdiff
path: root/test/test.cpp
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhsoting.net>2022-01-09 18:59:52 +0100
committerJörg Frings-Fürst <debian@jff-webhsoting.net>2022-01-09 18:59:52 +0100
commitf308d3149d855c4d6d0251cf6bce393dfa371329 (patch)
tree1c109543808e40e553cfea44f1329bd410f743ff /test/test.cpp
parentd336d9867cfdbf1683653de369d67f5c7bea3f5e (diff)
parent592ab485a70ab4c8e4cefc37bbdfb76110f9205e (diff)
Update upstream source from tag 'upstream/0.9.6'
Update to upstream version '0.9.6' with Debian dir 046219032722c15fb3571e4dcdc4a0f0c418b137
Diffstat (limited to 'test/test.cpp')
-rw-r--r--test/test.cpp76
1 files changed, 75 insertions, 1 deletions
diff --git a/test/test.cpp b/test/test.cpp
index 4b156a4..31e9866 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -267,7 +267,7 @@ TEST(UriSuite, TestIpSixOverread) {
// NOTE: This string is designed to not have a terminator
char uriText[2 + 3 + 2 + 1 + 1];
- strncpy(uriText, "//[::44.1", sizeof(uriText));
+ memcpy(uriText, "//[::44.1", sizeof(uriText));
EXPECT_EQ(uriParseSingleUriExA(&uri, uriText,
uriText + sizeof(uriText), &errorPos), URI_ERROR_SYNTAX);
@@ -2216,6 +2216,45 @@ TEST(FreeUriMembersSuite, MultiFreeWorksFine) {
uriFreeUriMembersA(&uri); // second time
}
+namespace {
+ void testFreeUriMembersFreesHostText(const char *const uriFirst) { // issue #121
+ const char *const uriAfterLast = uriFirst + strlen(uriFirst);
+ UriUriA uri;
+
+ EXPECT_EQ(uriParseSingleUriA(&uri, uriFirst, NULL), URI_SUCCESS);
+ EXPECT_EQ(uriMakeOwnerA(&uri), URI_SUCCESS);
+
+ EXPECT_EQ(uri.owner, URI_TRUE);
+ EXPECT_TRUE(uri.hostText.first);
+ EXPECT_TRUE(uri.hostText.afterLast);
+ EXPECT_NE(uri.hostText.first, uri.hostText.afterLast);
+ URI_EXPECT_RANGE_OUTSIDE(uri.hostText, uriFirst, uriAfterLast);
+
+ uriFreeUriMembersA(&uri);
+
+ EXPECT_FALSE(uri.hostText.first);
+ EXPECT_FALSE(uri.hostText.afterLast);
+
+ uriFreeUriMembersA(&uri); // second time
+ }
+} // namespace
+
+TEST(FreeUriMembersSuite, FreeUriMembersFreesHostTextIp4) { // issue #121
+ testFreeUriMembersFreesHostText("//192.0.2.0"); // RFC 5737
+}
+
+TEST(FreeUriMembersSuite, FreeUriMembersFreesHostTextIp6) { // issue #121
+ testFreeUriMembersFreesHostText("//[2001:db8::]"); // RFC 3849
+}
+
+TEST(FreeUriMembersSuite, FreeUriMembersFreesHostTextRegname) { // issue #121
+ testFreeUriMembersFreesHostText("//host123.test"); // RFC 6761
+}
+
+TEST(FreeUriMembersSuite, FreeUriMembersFreesHostTextFuture) { // issue #121
+ testFreeUriMembersFreesHostText("//[v7.X]"); // arbitrary IPvFuture
+}
+
TEST(MakeOwnerSuite, MakeOwner) {
const char * const uriString = "scheme://user:pass@[v7.X]:55555/path/../path/?query#fragment";
UriUriA uri;
@@ -2275,6 +2314,41 @@ TEST(MakeOwnerSuite, MakeOwner) {
uriFreeUriMembersA(&uri);
}
+namespace {
+ void testMakeOwnerCopiesHostText(const char *const uriFirst) { // issue #121
+ const char *const uriAfterLast = uriFirst + strlen(uriFirst);
+ UriUriA uri;
+
+ EXPECT_EQ(uriParseSingleUriA(&uri, uriFirst, NULL), URI_SUCCESS);
+ EXPECT_EQ(uri.owner, URI_FALSE);
+ URI_EXPECT_RANGE_BETWEEN(uri.hostText, uriFirst, uriAfterLast);
+
+ EXPECT_EQ(uriMakeOwnerA(&uri), URI_SUCCESS);
+
+ EXPECT_EQ(uri.owner, URI_TRUE);
+ URI_EXPECT_RANGE_OUTSIDE(uri.hostText, uriFirst, uriAfterLast);
+
+ uriFreeUriMembersA(&uri);
+ uriFreeUriMembersA(&uri); // tried freeing stack pointers before the fix
+ }
+} // namespace
+
+TEST(MakeOwnerSuite, MakeOwnerCopiesHostTextIp4) { // issue #121
+ testMakeOwnerCopiesHostText("//192.0.2.0"); // RFC 5737
+}
+
+TEST(MakeOwnerSuite, MakeOwnerCopiesHostTextIp6) { // issue #121
+ testMakeOwnerCopiesHostText("//[2001:db8::]"); // RFC 3849
+}
+
+TEST(MakeOwnerSuite, MakeOwnerCopiesHostTextRegname) { // issue #121
+ testMakeOwnerCopiesHostText("//host123.test"); // RFC 6761
+}
+
+TEST(MakeOwnerSuite, MakeOwnerCopiesHostTextFuture) { // issue #121
+ testMakeOwnerCopiesHostText("//[v7.X]"); // arbitrary IPvFuture
+}
+
TEST(ParseIpFourAddressSuite, FourSaneOctets) {
unsigned char octetOutput[4];
const char * const ipAddressText = "111.22.3.40";