Changeset b401b33 in mainline for uspace/lib/c/test/strtol.c

Timestamp:

2019-06-06T12:15:29Z (5 years ago)

Author:

GitHub <noreply@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2a103b5, e28175d

Parents:

83b64a59 (diff), 42e91ae (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-06 12:15:29)

git-committer:

GitHub <noreply@…> (2019-06-06 12:15:29)

Message:

Merge pull request #169 from le-jzr/strtolwip

Removes internal str_uint() function in favor of the one in strtol.c.
Fixes handling of a bunch of corner cases.
The expected behavior of str_uint*_t() functions should be unchanged.

File:

• uspace/lib/c/test/strtol.c (modified) (5 diffs)

uspace/lib/c/test/strtol.c

@@ -38 +38 @@
 #include <stdlib.h>
 #include <str.h>
+#include <limits.h>
 
 PCUT_INIT;
@@ -217 +218 @@
         /* Correct result. */
         PCUT_ASSERT_INT_EQUALS(EOVERFLOW, rc);
-        PCUT_ASSERT_UINT_EQUALS(UINT64_MAX, result);
 #endif
 
@@ -245 +245 @@
         /* Correct result. */
         PCUT_ASSERT_INT_EQUALS(EOVERFLOW, rc);
-        PCUT_ASSERT_UINT_EQUALS(UINT64_MAX, result);
 #endif
+}
+
+PCUT_TEST(strtoul_negative_wraparound)
+{
+        long output;
+        char *endp;
+        char *endp_unchanged = (char *) "endp_unchanged unique pointer";
+        int errno_unchanged = -1;
+        const char *input;
+        int base;
+
+        /*
+         * N2176 7.22.1.4 The strtol, strtoll, strtoul, and strtoull functions
+         *
+         * "If the subject sequence begins with a minus sign, the value
+         * resulting from the conversion is negated (in the return type)."
+         */
+
+        endp = endp_unchanged;
+        errno = errno_unchanged;
+        output = strtoul(input = "-10", &endp, base = 0);
+        PCUT_ASSERT_INT_EQUALS(errno_unchanged, errno);
+        PCUT_ASSERT_PTR_EQUALS(input + 3, endp);
+        PCUT_ASSERT_UINT_EQUALS(-(10ul), output);
 }
 
@@ -404 +427 @@
         endp = endp_unchanged;
         errno = errno_unchanged;
+        output = strtol(input = "    0xg", &endp, base = 0);
+        PCUT_ASSERT_INT_EQUALS(errno_unchanged, errno);
+        PCUT_ASSERT_PTR_EQUALS(input + 5, endp);
+        PCUT_ASSERT_INT_EQUALS(0, output);
+
+        endp = endp_unchanged;
+        errno = errno_unchanged;
         output = strtol(input = "    0x1", &endp, base = 0);
         PCUT_ASSERT_INT_EQUALS(errno_unchanged, errno);
@@ -418 +448 @@
         endp = endp_unchanged;
         errno = errno_unchanged;
+        output = strtol(input = "    0xg", &endp, base = 16);
+        PCUT_ASSERT_INT_EQUALS(errno_unchanged, errno);
+        PCUT_ASSERT_PTR_EQUALS(input + 5, endp);
+        PCUT_ASSERT_INT_EQUALS(0, output);
+
+        endp = endp_unchanged;
+        errno = errno_unchanged;
+        output = strtol(input = "    g", &endp, base = 16);
+        PCUT_ASSERT_INT_EQUALS(errno_unchanged, errno);
+        PCUT_ASSERT_PTR_EQUALS(input, endp);
+        PCUT_ASSERT_INT_EQUALS(0, output);
+
+        endp = endp_unchanged;
+        errno = errno_unchanged;
         output = strtol(input = "    0x1", &endp, base = 16);
         PCUT_ASSERT_INT_EQUALS(errno_unchanged, errno);
         PCUT_ASSERT_PTR_EQUALS(input + 7, endp);
         PCUT_ASSERT_INT_EQUALS(1, output);
+
+        endp = endp_unchanged;
+        errno = errno_unchanged;
+        output = strtol(input = "    +", &endp, base = 0);
+        PCUT_ASSERT_INT_EQUALS(errno_unchanged, errno);
+        PCUT_ASSERT_PTR_EQUALS(input, endp);
+        PCUT_ASSERT_INT_EQUALS(0, output);
+
+        endp = endp_unchanged;
+        errno = errno_unchanged;
+        output = strtol(input = "    -", &endp, base = 0);
+        PCUT_ASSERT_INT_EQUALS(errno_unchanged, errno);
+        PCUT_ASSERT_PTR_EQUALS(input, endp);
+        PCUT_ASSERT_INT_EQUALS(0, output);
+
+        endp = endp_unchanged;
+        errno = errno_unchanged;
+        output = strtol(input = "    +", &endp, base = 10);
+        PCUT_ASSERT_INT_EQUALS(errno_unchanged, errno);
+        PCUT_ASSERT_PTR_EQUALS(input, endp);
+        PCUT_ASSERT_INT_EQUALS(0, output);
+
+        endp = endp_unchanged;
+        errno = errno_unchanged;
+        output = strtol(input = "    -", &endp, base = 10);
+        PCUT_ASSERT_INT_EQUALS(errno_unchanged, errno);
+        PCUT_ASSERT_PTR_EQUALS(input, endp);
+        PCUT_ASSERT_INT_EQUALS(0, output);
+
+        endp = endp_unchanged;
+        errno = errno_unchanged;
+        output = strtol(input = "+", &endp, base = 0);
+        PCUT_ASSERT_INT_EQUALS(errno_unchanged, errno);
+        PCUT_ASSERT_PTR_EQUALS(input, endp);
+        PCUT_ASSERT_INT_EQUALS(0, output);
+
+        endp = endp_unchanged;
+        errno = errno_unchanged;
+        output = strtol(input = "-", &endp, base = 0);
+        PCUT_ASSERT_INT_EQUALS(errno_unchanged, errno);
+        PCUT_ASSERT_PTR_EQUALS(input, endp);
+        PCUT_ASSERT_INT_EQUALS(0, output);
+
+        endp = endp_unchanged;
+        errno = errno_unchanged;
+        output = strtol(input = "+", &endp, base = 10);
+        PCUT_ASSERT_INT_EQUALS(errno_unchanged, errno);
+        PCUT_ASSERT_PTR_EQUALS(input, endp);
+        PCUT_ASSERT_INT_EQUALS(0, output);
+
+        endp = endp_unchanged;
+        errno = errno_unchanged;
+        output = strtol(input = "-", &endp, base = 10);
+        PCUT_ASSERT_INT_EQUALS(errno_unchanged, errno);
+        PCUT_ASSERT_PTR_EQUALS(input, endp);
+        PCUT_ASSERT_INT_EQUALS(0, output);
 }