King_DuckZ/Loki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix wrong buffer size check

Browse source 
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@691 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
syntheticpp 2006-07-03 09:55:19 +00:00
parent c6a110f676
commit 289bc55ba0
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/loki/SafeFormat.h
View file

@ -61,8 +61,11 @@ namespace Loki
template <class Char> template <class Char>
void write(std::pair<Char*, std::size_t>& s, const Char* from, const Char* to) { void write(std::pair<Char*, std::size_t>& s, const Char* from, const Char* to) {
assert(from <= to); assert(from <= to);
if (from + s.second > to) throw std::overflow_error(""); if(from + s.second < to)
s.first = copy(from, to, s.first); throw std::overflow_error("");
// s.first: position one past the final copied element
s.first = std::copy(from, to, s.first);
// remaining buffer size
s.second -= to - from; s.second -= to - from;
} }
@ -573,6 +576,9 @@ namespace Loki
#endif //SAFEFORMAT_H_ #endif //SAFEFORMAT_H_
// $Log$ // $Log$
// Revision 1.27 2006/07/03 09:55:19 syntheticpp
// fix wrong buffer size check
//
// Revision 1.26 2006/06/28 08:04:21 syntheticpp // Revision 1.26 2006/06/28 08:04:21 syntheticpp
// use standard conforming naming, SUN's compiler needs it // use standard conforming naming, SUN's compiler needs it
// //