OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR libstdc++/14648 (rope is broken (regression))

Browse Source 
2004-03-19  Paolo Carlini  <pcarlini@suse.de>

	PR libstdc++/14648
	* include/ext/ropeimpl.h (rope<>::_S_apply_to_pieces): Fix
	memory allocation/deallocation calls.
	* testsuite/ext/14648.cc: New.

From-SVN: r79687
This commit is contained in:
Paolo Carlini 2004-03-19 16:08:15 +00:00 committed by Paolo Carlini
parent 30f3b32b41
commit 59d3567214
3 changed files with 50 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,10 @@
2004-03-19 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/14648
* include/ext/ropeimpl.h (rope<>::_S_apply_to_pieces): Fix
memory allocation/deallocation calls.
* testsuite/ext/14648.cc: New.
2004-03-19 Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de>
PR libstdc++/14647

6
libstdc++-v3/include/ext/ropeimpl.h
View File

@ -874,15 +874,15 @@ bool rope<_CharT, _Alloc>::_S_apply_to_pieces(
size_t __len = __end - __begin;
bool __result;
_CharT* __buffer =
(_CharT*)_Alloc::allocate(__len * sizeof(_CharT));
(_CharT*)_Alloc().allocate(__len * sizeof(_CharT));
try {
(*(__f->_M_fn))(__begin, __len, __buffer);
__result = __c(__buffer, __len);
_Alloc::deallocate(__buffer, __len * sizeof(_CharT));
_Alloc().deallocate(__buffer, __len * sizeof(_CharT));
}
catch(...)
{
_Alloc::deallocate(__buffer, __len * sizeof(_CharT));
_Alloc().deallocate(__buffer, __len * sizeof(_CharT));
__throw_exception_again;
}
return __result;

40
libstdc++-v3/testsuite/ext/14648.cc Normal file
View File

@ -0,0 +1,40 @@
// Copyright (C) 2004 Free Software Foundation
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
// terms of the GNU General Public License as published by the
// Free Software Foundation; either version 2, or (at your option)
// any later version.
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING. If not, write to the Free
// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
// USA.
#include <iostream>
#include <ext/hash_map>
#include <ext/rope>
// libstdc++/14648
void test01()
{
using namespace std;
using namespace __gnu_cxx;
typedef hash_map<char, crope, hash<char>, equal_to<char> > maptype;
maptype m;
m['l'] = "50";
m['x'] = "10";
cout << "m['x'] = " << m['x'] << endl;
}
int main()
{
test01();
return 0;
}