diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2017-02-16 12:06:28 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2017-02-16 12:06:28 +0000 |
| commit | 728e81e3bcbcff0ab4e745c98dd5cde89c02a90d (patch) | |
| tree | 6e0064dffb0e30bd81371338c15faf30a1739ab2 /libstdc++-v3 | |
| parent | bcac0b4dac8901040c029922589d7a06a119b574 (diff) | |
| download | gcc-728e81e3bcbcff0ab4e745c98dd5cde89c02a90d.tar.gz | |
PR libstdc++/60936 fix length calculation
PR libstdc++/60936
* src/c++11/snprintf_lite.cc (__concat_size_t): Calculate length
written to buffer, not length remaining in buffer.
From-SVN: r245505
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/src/c++11/snprintf_lite.cc | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 5ce466fa9ec..c73d75fdf83 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2017-02-16 Jonathan Wakely <jwakely@redhat.com> + + PR libstdc++/60936 + * src/c++11/snprintf_lite.cc (__concat_size_t): Calculate length + written to buffer, not length remaining in buffer. + 2017-02-15 Tim Shen <timshen@google.com> PR libstdc++/78723 diff --git a/libstdc++-v3/src/c++11/snprintf_lite.cc b/libstdc++-v3/src/c++11/snprintf_lite.cc index 1a408ca1d8f..de132d92dd4 100644 --- a/libstdc++-v3/src/c++11/snprintf_lite.cc +++ b/libstdc++-v3/src/c++11/snprintf_lite.cc @@ -81,7 +81,7 @@ namespace __gnu_cxx { __val /= 10; } while (__val != 0); - size_t __len = __out - __cs; + size_t __len = __cs + __ilen - __out; if (__bufsize < __len) return -1; |