Overview
Comment: | OF*Data: Avoid -[allocMemoryWithSize:] |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
1a70abc65dc376448a4ef0e6674c7c5b |
User & Date: | js on 2020-11-06 01:11:51 |
Other Links: | manifest | tags |
Context
2020-11-06
| ||
01:23 | OFArray: Fix minor performance regression check-in: 51ea191cf4 user: js tags: trunk | |
01:11 | OF*Data: Avoid -[allocMemoryWithSize:] check-in: 1a70abc65d user: js tags: trunk | |
00:58 | OFList: Avoid -[allocMemoryWithSize:] check-in: db15314420 user: js tags: trunk | |
Changes
Modified src/OFData.m from [20a79e42c1] to [f4f38100bd].
︙ | |||
129 130 131 132 133 134 135 | 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 | - + - + | { self = [super init]; @try { if (itemSize == 0) @throw [OFInvalidArgumentException exception]; |
︙ | |||
242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 | 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 | + - - + | exceptionWithURL: URL]; stream = [URLHandler openItemAtURL: URL mode: @"r"]; _itemSize = 1; _count = 0; _freeWhenDone = true; pageSize = [OFSystemInfo pageSize]; buffer = of_malloc(1, pageSize); @try { while (!stream.atEndOfStream) { size_t length = [stream readIntoBuffer: buffer length: pageSize]; if (SIZE_MAX - _count < length) @throw [OFOutOfRangeException exception]; |
︙ | |||
288 289 290 291 292 293 294 | 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 | - + + | const char *cString; if (count % 2 != 0) @throw [OFInvalidFormatException exception]; count /= 2; |
︙ |
Modified src/OFMutableData.m from [6ca92c6b7f] to [aec71097cd].
︙ | |||
52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 | 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 | + + | } - (instancetype)init { self = [super init]; _itemSize = 1; _freeWhenDone = true; return self; } - (instancetype)initWithItemSize: (size_t)itemSize { self = [super init]; @try { if (itemSize == 0) @throw [OFInvalidArgumentException exception]; _itemSize = itemSize; _freeWhenDone = true; } @catch (id e) { [self release]; @throw e; } return self; } |
︙ | |||
88 89 90 91 92 93 94 | 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 | - - - + + | { self = [super init]; @try { if (itemSize == 0) @throw [OFInvalidArgumentException exception]; |
︙ | |||
184 185 186 187 188 189 190 | 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 | - + - - | - (void)addItem: (const void *)item { if (SIZE_MAX - _count < 1) @throw [OFOutOfRangeException exception]; if (_count + 1 > _capacity) { |
︙ | |||
210 211 212 213 214 215 216 | 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 | - - - + - - - + - - - + | - (void)addItems: (const void *)items count: (size_t)count { if (count > SIZE_MAX - _count) @throw [OFOutOfRangeException exception]; if (_count + count > _capacity) { |
︙ | |||
274 275 276 277 278 279 280 | 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 | - + - - - + - - - - + | memmove(_items + range.location * _itemSize, _items + (range.location + range.length) * _itemSize, (_count - range.location - range.length) * _itemSize); _count -= range.length; @try { |
︙ |
Modified src/OFSecureData.m from [de9178b4e4] to [3742a91d29].
︙ | |||
411 412 413 414 415 416 417 | 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 | - - + + | size_t pageSize = [OFSystemInfo pageSize]; #endif if (count > SIZE_MAX / itemSize) @throw [OFOutOfRangeException exception]; if (allowsSwappableMemory) { |
︙ |