Changeset 0d14c25 in mainline for uspace/lib/cpp/include/__bits/locale/num_get.hpp

Timestamp:

2019-05-27T12:38:26Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

bebd154

Parents:

bc56f30

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-24 16:25:38)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-05-27 12:38:26)

Message:

Fix behavior of stream >> for invalid numeric conversion

File:

• uspace/lib/cpp/include/__bits/locale/num_get.hpp (modified) (1 diff)

uspace/lib/cpp/include/__bits/locale/num_get.hpp

@@ -303 +303 @@
                     int olderrno{errno};
                     errno = EOK;
+                    char *endptr = NULL;
 
                     if constexpr (is_signed<BaseType>::value)
-                        res = ::strtoll(base.buffer_, nullptr, num_base);
-                    else
-                        res = ::strtoull(base.buffer_, nullptr, num_base);
-
-                    if (errno != EOK)
+                        res = ::strtoll(base.buffer_, &endptr, num_base);
+                    else
+                        res = ::strtoull(base.buffer_, &endptr, num_base);
+
+                    if (errno != EOK || endptr == base.buffer_)
                         err |= ios_base::failbit;