From b82a33d2a9dfc943324f34c60e4b231baa236eca Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Wed, 18 Jun 2003 21:13:18 +0200 Subject: [PATCH] std_sstream.h (setbuf): Check __n >= 0. 2003-06-18 Paolo Carlini Benjamin Kosnik * include/std/std_sstream.h (setbuf): Check __n >= 0. * include/bits/fstream.tcc (setbuf): Tweak. Co-Authored-By: Benjamin Kosnik From-SVN: r68163 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/bits/fstream.tcc | 2 +- libstdc++-v3/include/std/std_sstream.h | 8 ++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index fad6a0868ed..ac0426e9f80 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2003-06-18 Paolo Carlini + Benjamin Kosnik + + * include/std/std_sstream.h (setbuf): Check __n >= 0. + * include/bits/fstream.tcc (setbuf): Tweak. + 2003-06-18 Paolo Carlini * include/bits/sstream.tcc (seekoff): We can't seek beyond diff --git a/libstdc++-v3/include/bits/fstream.tcc b/libstdc++-v3/include/bits/fstream.tcc index c0ef882422a..13275882c47 100644 --- a/libstdc++-v3/include/bits/fstream.tcc +++ b/libstdc++-v3/include/bits/fstream.tcc @@ -429,7 +429,7 @@ namespace std { if (!this->is_open() && __s == 0 && __n == 0) this->_M_buf_size = 1; - else if (__s && __n >= 1) + else if (__s && __n > 0) { // This is implementation-defined behavior, and assumes that // an external char_type array of length __n exists and has diff --git a/libstdc++-v3/include/std/std_sstream.h b/libstdc++-v3/include/std/std_sstream.h index ca7b1e5484b..a720d3569ff 100644 --- a/libstdc++-v3/include/std/std_sstream.h +++ b/libstdc++-v3/include/std/std_sstream.h @@ -208,12 +208,12 @@ namespace std virtual __streambuf_type* setbuf(char_type* __s, streamsize __n) { - if (__s && __n) + if (__s && __n >= 0) { // This is implementation-defined behavior, and assumes - // that an external char_type array of length (__s + __n) - // exists and has been pre-allocated. If this is not the - // case, things will quickly blow up. + // that an external char_type array of length __n exists + // and has been pre-allocated. If this is not the case, + // things will quickly blow up. // Step 1: Destroy the current internal array. _M_string = __string_type(__s, __n);