gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 17:10:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't set mutations pointer to on-stack value which could randomly get set

Browse source 
to contain garbage ... use self instead.



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@37563 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2014-01-09 09:00:24 +00:00
parent 99517dd9b1
commit 6475418c5e
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Source/NSArray.m
View file

@ -390,15 +390,21 @@ static SEL rlSel;
objects: (__unsafe_unretained id[])stackbuf
count: (NSUInteger)len
{
NSUInteger size = [self count];
NSInteger count;
/* This is cached in the caller at the start and compared at each
/* In a mutable subclass, the mutationsPtr should be set to point to a
* value (unsigned long) which will be changed (incremented) whenever
* the container is mutated (content added, removed, re-ordered).
* This is cached in the caller at the start and compared at each
* iteration. If it changes during the iteration then
* objc_enumerationMutation() will be called, throwing an exception.
* The abstract base class implementation points to a fixed value
* (the instance itsself is guaranteed to exist for as long as the
* enumeration process runs), which is fine for enumerating an
* immutable array.
*/
state->mutationsPtr = (unsigned long *)size;
count = MIN(len, size - state->state);
state->mutationsPtr = (unsigned long *)self;
count = MIN(len, [self count] - state->state);
/* If a mutation has occurred then it's possible that we are being asked to
* get objects from after the end of the array. Don't pass negative values
* to memcpy.