mirror of
https://github.com/minetest/irrlicht.git
synced 2024-12-24 17:50:31 +01:00
Merging r6286 through r6421 from branch releases/1.8 to trunk
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6422 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
parent
ca7000aea8
commit
88b7bed20f
@ -374,6 +374,7 @@ Changes in 1.9 (not yet released)
|
||||
|
||||
--------------------------
|
||||
Changes in 1.8.6
|
||||
- Avoid warning about stringop-overflow in string<T>::subString when compiling in release with newer gcc
|
||||
- Update library zlib to 1.2.11 (from 1.2.8)
|
||||
- Update library bzip2 to 1.0.8 (from 1.0.6)
|
||||
- Security: Fix buffer overflow caused by malformed md2 files. Thanks @procfs for reporting (https://irrlicht.sourceforge.io/forum/viewtopic.php?f=7&t=52785)
|
||||
|
@ -947,13 +947,13 @@ public:
|
||||
\param make_lower copy only lower case */
|
||||
string<T> subString(u32 begin, s32 length, bool make_lower = false ) const
|
||||
{
|
||||
// clamp length to maximal value
|
||||
if ((length+begin) > size())
|
||||
length = size()-begin;
|
||||
// if start after string
|
||||
// or no proper substring length
|
||||
if ((length <= 0) || (begin>=size()))
|
||||
return string<T>("");
|
||||
// clamp length to maximal value
|
||||
if ((length+begin) > size())
|
||||
length = size()-begin;
|
||||
|
||||
string<T> o;
|
||||
o.reserve(length+1);
|
||||
|
@ -1,4 +1,4 @@
|
||||
Tests finished. 72 tests of 72 passed.
|
||||
Compiled as DEBUG
|
||||
Test suite pass at GMT Sat May 14 18:16:57 2022
|
||||
Test suite pass at GMT Thu Sep 15 20:10:06 2022
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user