Changeset b1b500b in mainline

Timestamp:

2018-07-05T21:41:18Z (7 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

27473fb8

Parents:

9315761

git-author:

Jaroslav Jindrak <dzejrou@…> (2017-10-30 13:49:31)

git-committer:

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

Message:

cpp: fixed bugs found by append tests

File:

• uspace/lib/cpp/include/impl/string.hpp (modified) (2 diffs)

uspace/lib/cpp/include/impl/string.hpp

@@ -642 +642 @@
                 {
                     auto len = min(n, str.size() - pos);
-                    ensure_free_space_(len);
 
                     return append(str.data() + pos, len);
@@ -653 +652 @@
                 // TODO: if (size_ + n > max_size()) throw length_error
                 ensure_free_space_(n);
-                traits_type::copy(data_ + size_, str, n);
-                size_ += n;
+                traits_type::copy(data_ + size_ - 1, str, n);
+                size_ += n - 1; // We are not copying str's null terminator.
                 ensure_null_terminator_();