ObjFW: Check-in [577f0a744b]

Overview

Comment:	OFStream: More range checks
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA3-256:	577f0a744bfbd5c986893dac06a6b9e84a4e157aed0af0e4e172d6b3ccfc039d
User & Date:	js on 2017-06-05 12:50:48
Other Links:	manifest \| tags

Context

2017-06-05
15:51		OFStream: Don't throw when at end of stream check-in: f9cd4f9cab user: js tags: trunk
12:50		OFStream: More range checks check-in: 577f0a744b user: js tags: trunk
01:07		runtime: get_method(): Look in categories first check-in: e55ca11653 user: js tags: trunk

Changes

Hide Diffs Side-by-Side Diffs Show Whitespace Changes Patch

Modified src/OFStream.m from [ffb5628418] to [3e8867dc7e].

︙
288 289 290 291 292 293 294 ~~295~~ 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 ~~311~~ 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 ~~327~~ 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 ~~343~~ 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 ~~359~~ 360 361 362 363 364 365 366	288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391	+ + + + + - + + + + + + - + + + + + + - + + + + + + - + + + + + + - +	return OF_BSWAP_DOUBLE_IF_LE(ret); } - (size_t)readBigEndianInt16sIntoBuffer: (uint16_t )buffer count: (size_t)count { size_t size; if OF_UNLIKELY (count > SIZE_MAX / sizeof(uint16_t)) @throw [OFOutOfRangeException exception]; ~~~~size_t~~ size = count sizeof(uint16_t);~~ size = count * sizeof(uint16_t); [self readIntoBuffer: buffer exactLength: size]; #ifndef OF_BIG_ENDIAN for (size_t i = 0; i < count; i++) buffer[i] = OF_BSWAP16(buffer[i]); #endif return size; } - (size_t)readBigEndianInt32sIntoBuffer: (uint32_t )buffer count: (size_t)count { size_t size; if OF_UNLIKELY (count > SIZE_MAX / sizeof(uint32_t)) @throw [OFOutOfRangeException exception]; ~~~~size_t~~ size = count sizeof(uint32_t);~~ size = count * sizeof(uint32_t); [self readIntoBuffer: buffer exactLength: size]; #ifndef OF_BIG_ENDIAN for (size_t i = 0; i < count; i++) buffer[i] = OF_BSWAP32(buffer[i]); #endif return size; } - (size_t)readBigEndianInt64sIntoBuffer: (uint64_t )buffer count: (size_t)count { size_t size; if OF_UNLIKELY (count > SIZE_MAX / sizeof(uint64_t)) @throw [OFOutOfRangeException exception]; ~~~~size_t~~ size = count sizeof(uint64_t);~~ size = count * sizeof(uint64_t); [self readIntoBuffer: buffer exactLength: size]; #ifndef OF_BIG_ENDIAN for (size_t i = 0; i < count; i++) buffer[i] = OF_BSWAP64(buffer[i]); #endif return size; } - (size_t)readBigEndianFloatsIntoBuffer: (float )buffer count: (size_t)count { size_t size; if OF_UNLIKELY (count > SIZE_MAX / sizeof(float)) @throw [OFOutOfRangeException exception]; ~~~~size_t~~ size = count sizeof(float);~~ size = count * sizeof(float); [self readIntoBuffer: buffer exactLength: size]; #ifndef OF_FLOAT_BIG_ENDIAN for (size_t i = 0; i < count; i++) buffer[i] = OF_BSWAP_FLOAT(buffer[i]); #endif return size; } - (size_t)readBigEndianDoublesIntoBuffer: (double )buffer count: (size_t)count { size_t size; if OF_UNLIKELY (count > SIZE_MAX / sizeof(double)) @throw [OFOutOfRangeException exception]; ~~~~size_t~~ size = count sizeof(double);~~ size = count * sizeof(double); [self readIntoBuffer: buffer exactLength: size]; #ifndef OF_FLOAT_BIG_ENDIAN for (size_t i = 0; i < count; i++) buffer[i] = OF_BSWAP_DOUBLE(buffer[i]);
︙
418 419 420 421 422 423 424 ~~425~~ 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 ~~441~~ 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 ~~457~~ 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 ~~473~~ 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 ~~489~~ 490 491 492 493 494 495 496	443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546	+ + + + + - + + + + + + - + + + + + + - + + + + + + - + + + + + + - +	return OF_BSWAP_DOUBLE_IF_BE(ret); } - (size_t)readLittleEndianInt16sIntoBuffer: (uint16_t )buffer count: (size_t)count { size_t size; if OF_UNLIKELY (count > SIZE_MAX / sizeof(uint16_t)) @throw [OFOutOfRangeException exception]; ~~~~size_t~~ size = count sizeof(uint16_t);~~ size = count * sizeof(uint16_t); [self readIntoBuffer: buffer exactLength: size]; #ifdef OF_BIG_ENDIAN for (size_t i = 0; i < count; i++) buffer[i] = OF_BSWAP16(buffer[i]); #endif return size; } - (size_t)readLittleEndianInt32sIntoBuffer: (uint32_t )buffer count: (size_t)count { size_t size; if OF_UNLIKELY (count > SIZE_MAX / sizeof(uint32_t)) @throw [OFOutOfRangeException exception]; ~~~~size_t~~ size = count sizeof(uint32_t);~~ size = count * sizeof(uint32_t); [self readIntoBuffer: buffer exactLength: size]; #ifdef OF_BIG_ENDIAN for (size_t i = 0; i < count; i++) buffer[i] = OF_BSWAP32(buffer[i]); #endif return size; } - (size_t)readLittleEndianInt64sIntoBuffer: (uint64_t )buffer count: (size_t)count { size_t size; if OF_UNLIKELY (count > SIZE_MAX / sizeof(uint64_t)) @throw [OFOutOfRangeException exception]; ~~~~size_t~~ size = count sizeof(uint64_t);~~ size = count * sizeof(uint64_t); [self readIntoBuffer: buffer exactLength: size]; #ifdef OF_BIG_ENDIAN for (size_t i = 0; i < count; i++) buffer[i] = OF_BSWAP64(buffer[i]); #endif return size; } - (size_t)readLittleEndianFloatsIntoBuffer: (float )buffer count: (size_t)count { size_t size; if OF_UNLIKELY (count > SIZE_MAX / sizeof(float)) @throw [OFOutOfRangeException exception]; ~~~~size_t~~ size = count sizeof(float);~~ size = count * sizeof(float); [self readIntoBuffer: buffer exactLength: size]; #ifdef OF_FLOAT_BIG_ENDIAN for (size_t i = 0; i < count; i++) buffer[i] = OF_BSWAP_FLOAT(buffer[i]); #endif return size; } - (size_t)readLittleEndianDoublesIntoBuffer: (double )buffer count: (size_t)count { size_t size; if OF_UNLIKELY (count > SIZE_MAX / sizeof(double)) @throw [OFOutOfRangeException exception]; ~~~~size_t~~ size = count sizeof(double);~~ size = count * sizeof(double); [self readIntoBuffer: buffer exactLength: size]; #ifdef OF_FLOAT_BIG_ENDIAN for (size_t i = 0; i < count; i++) buffer[i] = OF_BSWAP_DOUBLE(buffer[i]);
︙
1037 1038 1039 1040 1041 1042 1043 ~~1044~~ 1045 1046 1047 1048 1049 1050 1051	1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106	+ + + + + - +	[self writeBuffer: (char )&double_ length: 8]; } - (size_t)writeBigEndianInt16s: (const uint16_t )buffer count: (size_t)count { size_t size; if OF_UNLIKELY (count > SIZE_MAX / sizeof(uint16_t)) @throw [OFOutOfRangeException exception]; ~~~~size_t~~ size = count * sizeof(uint16_t);~~ size = count * sizeof(uint16_t); #ifdef OF_BIG_ENDIAN [self writeBuffer: buffer length: size]; #else uint16_t *tmp = [self allocMemoryWithSize: sizeof(uint16_t) count: count];
︙
1063 1064 1065 1066 1067 1068 1069 ~~1070~~ 1071 1072 1073 1074 1075 1076 1077	1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137	+ + + + + - +	return size; } - (size_t)writeBigEndianInt32s: (const uint32_t )buffer count: (size_t)count { size_t size; if OF_UNLIKELY (count > SIZE_MAX / sizeof(uint32_t)) @throw [OFOutOfRangeException exception]; ~~~~size_t~~ size = count sizeof(uint32_t);~~ size = count * sizeof(uint32_t); #ifdef OF_BIG_ENDIAN [self writeBuffer: buffer length: size]; #else uint32_t *tmp = [self allocMemoryWithSize: sizeof(uint32_t) count: count];
︙
1089 1090 1091 1092 1093 1094 1095 ~~1096~~ 1097 1098 1099 1100 1101 1102 1103	1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168	+ + + + + - +	return size; } - (size_t)writeBigEndianInt64s: (const uint64_t )buffer count: (size_t)count { size_t size; if OF_UNLIKELY (count > SIZE_MAX / sizeof(uint64_t)) @throw [OFOutOfRangeException exception]; ~~~~size_t~~ size = count sizeof(uint64_t);~~ size = count * sizeof(uint64_t); #ifdef OF_BIG_ENDIAN [self writeBuffer: buffer length: size]; #else uint64_t *tmp = [self allocMemoryWithSize: sizeof(uint64_t) count: count];
︙
1115 1116 1117 1118 1119 1120 1121 ~~1122~~ 1123 1124 1125 1126 1127 1128 1129	1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199	+ + + + + - +	return size; } - (size_t)writeBigEndianFloats: (const float )buffer count: (size_t)count { size_t size; if OF_UNLIKELY (count > SIZE_MAX / sizeof(float)) @throw [OFOutOfRangeException exception]; ~~~~size_t~~ size = count sizeof(float);~~ size = count * sizeof(float); #ifdef OF_FLOAT_BIG_ENDIAN [self writeBuffer: buffer length: size]; #else float *tmp = [self allocMemoryWithSize: sizeof(float) count: count];
︙
1141 1142 1143 1144 1145 1146 1147 ~~1148~~ 1149 1150 1151 1152 1153 1154 1155	1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230	+ + + + + - +	return size; } - (size_t)writeBigEndianDoubles: (const double )buffer count: (size_t)count { size_t size; if OF_UNLIKELY (count > SIZE_MAX / sizeof(double)) @throw [OFOutOfRangeException exception]; ~~~~size_t~~ size = count sizeof(double);~~ size = count * sizeof(double); #ifdef OF_FLOAT_BIG_ENDIAN [self writeBuffer: buffer length: size]; #else double *tmp = [self allocMemoryWithSize: sizeof(double) count: count];
︙
1207 1208 1209 1210 1211 1212 1213 ~~1214~~ 1215 1216 1217 1218 1219 1220 1221	1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301	+ + + + + - +	[self writeBuffer: (char )&double_ length: 8]; } - (size_t)writeLittleEndianInt16s: (const uint16_t )buffer count: (size_t)count { size_t size; if OF_UNLIKELY (count > SIZE_MAX / sizeof(uint16_t)) @throw [OFOutOfRangeException exception]; ~~~~size_t~~ size = count * sizeof(uint16_t);~~ size = count * sizeof(uint16_t); #ifndef OF_BIG_ENDIAN [self writeBuffer: buffer length: size]; #else uint16_t *tmp = [self allocMemoryWithSize: sizeof(uint16_t) count: count];
︙
1233 1234 1235 1236 1237 1238 1239 ~~1240~~ 1241 1242 1243 1244 1245 1246 1247	1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332	+ + + + + - +	return size; } - (size_t)writeLittleEndianInt32s: (const uint32_t )buffer count: (size_t)count { size_t size; if OF_UNLIKELY (count > SIZE_MAX / sizeof(uint32_t)) @throw [OFOutOfRangeException exception]; ~~~~size_t~~ size = count sizeof(uint32_t);~~ size = count * sizeof(uint32_t); #ifndef OF_BIG_ENDIAN [self writeBuffer: buffer length: size]; #else uint32_t *tmp = [self allocMemoryWithSize: sizeof(uint32_t) count: count];
︙
1259 1260 1261 1262 1263 1264 1265 ~~1266~~ 1267 1268 1269 1270 1271 1272 1273	1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363	+ + + + + - +	return size; } - (size_t)writeLittleEndianInt64s: (const uint64_t )buffer count: (size_t)count { size_t size; if OF_UNLIKELY (count > SIZE_MAX / sizeof(uint64_t)) @throw [OFOutOfRangeException exception]; ~~~~size_t~~ size = count sizeof(uint64_t);~~ size = count * sizeof(uint64_t); #ifndef OF_BIG_ENDIAN [self writeBuffer: buffer length: size]; #else uint64_t *tmp = [self allocMemoryWithSize: sizeof(uint64_t) count: count];
︙
1285 1286 1287 1288 1289 1290 1291 ~~1292~~ 1293 1294 1295 1296 1297 1298 1299	1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394	+ + + + + - +	return size; } - (size_t)writeLittleEndianFloats: (const float )buffer count: (size_t)count { size_t size; if OF_UNLIKELY (count > SIZE_MAX / sizeof(float)) @throw [OFOutOfRangeException exception]; ~~~~size_t~~ size = count sizeof(float);~~ size = count * sizeof(float); #ifndef OF_FLOAT_BIG_ENDIAN [self writeBuffer: buffer length: size]; #else float *tmp = [self allocMemoryWithSize: sizeof(float) count: count];
︙
1311 1312 1313 1314 1315 1316 1317 ~~1318~~ 1319 1320 1321 1322 1323 1324 1325	1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425	+ + + + + - +	return size; } - (size_t)writeLittleEndianDoubles: (const double )buffer count: (size_t)count { size_t size; if OF_UNLIKELY (count > SIZE_MAX / sizeof(double)) @throw [OFOutOfRangeException exception]; ~~~~size_t~~ size = count sizeof(double);~~ size = count * sizeof(double); #ifndef OF_FLOAT_BIG_ENDIAN [self writeBuffer: buffer length: size]; #else double *tmp = [self allocMemoryWithSize: sizeof(double) count: count];
︙

ObjFW Check-in [577f0a744b]