Differences From Artifact [1a1f8d234d]:
- File src/OFMapTable.m — part of check-in [917ce5754c] at 2012-12-22 15:37:19 on branch trunk — Add -[doesNotRecognizeSelector:]. (user: js, size: 15595) [annotate] [blame] [check-ins using]
To Artifact [3a2a927b76]:
- File
src/OFMapTable.m
— part of check-in
[7cebeaa808]
at
2013-01-03 22:26:36
on branch trunk
— OFMapTable: Rotate hashes randomly.
This makes the map table use the full range of the hash and not only the
least significant bits, making it harder for an attacker to find
collisions. (user: js, size: 15886) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
148 149 150 151 152 153 154 155 156 157 158 159 160 161 |
minCapacity = capacity;
buckets = [self allocMemoryWithSize: sizeof(*buckets)
count: capacity];
memset(buckets, 0, capacity * sizeof(*buckets));
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
| > > > > > > > > > | 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 |
minCapacity = capacity;
buckets = [self allocMemoryWithSize: sizeof(*buckets)
count: capacity];
memset(buckets, 0, capacity * sizeof(*buckets));
if (of_hash_seed != 0)
#if defined(OF_HAVE_ARC4RANDOM)
rotate = arc4random() & 31;
#elif defined(OF_HAVE_RANDOM)
rotate = random() & 31;
#else
rotate = rand() & 31;
#endif
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
|
| ︙ | ︙ | |||
203 204 205 206 207 208 209 |
- (uint32_t)hash
{
uint32_t i, hash = 0;
for (i = 0; i < capacity; i++) {
if (buckets[i] != NULL && buckets[i] != &deleted) {
| | | 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 |
- (uint32_t)hash
{
uint32_t i, hash = 0;
for (i = 0; i < capacity; i++) {
if (buckets[i] != NULL && buckets[i] != &deleted) {
hash += OF_ROR(buckets[i]->hash, rotate);
hash += valueFunctions.hash(buckets[i]->value);
}
}
return hash;
}
|
| ︙ | ︙ | |||
225 226 227 228 229 230 231 |
@try {
uint32_t i;
for (i = 0; i < capacity; i++)
if (buckets[i] != NULL && buckets[i] != &deleted)
[copy OF_setValue: buckets[i]->value
forKey: buckets[i]->key
| | > | 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 |
@try {
uint32_t i;
for (i = 0; i < capacity; i++)
if (buckets[i] != NULL && buckets[i] != &deleted)
[copy OF_setValue: buckets[i]->value
forKey: buckets[i]->key
hash: OF_ROR(buckets[i]->hash,
rotate)];
} @catch (id e) {
[copy release];
@throw e;
}
copy->minCapacity = MIN_CAPACITY;
|
| ︙ | ︙ | |||
250 251 252 253 254 255 256 | uint32_t i, hash, last; if (key == NULL) @throw [OFInvalidArgumentException exceptionWithClass: [self class] selector: _cmd]; | | | 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 |
uint32_t i, hash, last;
if (key == NULL)
@throw [OFInvalidArgumentException
exceptionWithClass: [self class]
selector: _cmd];
hash = OF_ROL(keyFunctions.hash(key), rotate);
last = capacity;
for (i = hash & (capacity - 1); i < last && buckets[i] != NULL; i++) {
if (buckets[i] == &deleted)
continue;
if (keyFunctions.equal(buckets[i]->key, key))
|
| ︙ | ︙ | |||
345 346 347 348 349 350 351 352 353 354 355 356 357 358 |
void *old;
if (key == NULL || value == NULL)
@throw [OFInvalidArgumentException
exceptionWithClass: [self class]
selector: _cmd];
last = capacity;
for (i = hash & (capacity - 1); i < last && buckets[i] != NULL; i++) {
if (buckets[i] == &deleted)
continue;
if (keyFunctions.equal(buckets[i]->key, key))
| > | 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 |
void *old;
if (key == NULL || value == NULL)
@throw [OFInvalidArgumentException
exceptionWithClass: [self class]
selector: _cmd];
hash = OF_ROL(hash, rotate);
last = capacity;
for (i = hash & (capacity - 1); i < last && buckets[i] != NULL; i++) {
if (buckets[i] == &deleted)
continue;
if (keyFunctions.equal(buckets[i]->key, key))
|
| ︙ | ︙ | |||
440 441 442 443 444 445 446 | uint32_t i, hash, last; if (key == NULL) @throw [OFInvalidArgumentException exceptionWithClass: [self class] selector: _cmd]; | | | 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 |
uint32_t i, hash, last;
if (key == NULL)
@throw [OFInvalidArgumentException
exceptionWithClass: [self class]
selector: _cmd];
hash = OF_ROL(keyFunctions.hash(key), rotate);
last = capacity;
for (i = hash & (capacity - 1); i < last && buckets[i] != NULL; i++) {
if (buckets[i] == &deleted)
continue;
if (keyFunctions.equal(buckets[i]->key, key)) {
|
| ︙ | ︙ |