Changeset c5b2b05 in mainline

Timestamp:

2018-07-05T21:41:19Z (6 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

6c242c3

Parents:

8d0953f

git-author:

Dzejrou <dzejrou@…> (2018-01-05 23:03:21)

git-committer:

Dzejrou <dzejrou@…> (2018-07-05 21:41:19)

Message:

cpp: fixed error handling in num_get parsing

File:

• uspace/lib/cpp/include/internal/locale/num_get.hpp (modified) (3 diffs)

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

@@ -36 +36 @@
 #include <limits>
 
+extern "C" {
+#include <errno.h>
+}
+
 namespace std
 {
@@ -281 +285 @@
             template<class BaseType, class T>
             iter_type get_integral_(iter_type in, iter_type end, ios_base& base,
-                                    ios_base::iostate err, T& v) const
+                                    ios_base::iostate& err, T& v) const
             {
                 BaseType res{};
@@ -295 +299 @@
                 if (size > 0)
                 {
+                    int ret{};
                     if constexpr (is_signed<BaseType>::value)
-                        str_int64_t(base.buffer_, nullptr, num_base, false, &res);
-                    else
-                        str_uint64_t(base.buffer_, nullptr, num_base, false, &res);
-
-                    if (res > static_cast<BaseType>(numeric_limits<T>::max()))
+                        ret = str_int64_t(base.buffer_, nullptr, num_base, false, &res);
+                    else
+                        ret = str_uint64_t(base.buffer_, nullptr, num_base, false, &res);
+
+                    if (ret != EOK)
+                    {
+                        err |= ios_base::failbit;
+                        v = 0;
+                    }
+                    else if (res > static_cast<BaseType>(numeric_limits<T>::max()))
                     {
                         err |= ios_base::failbit;