From 4c47459a01ed1469383bd02e3f06e0fa38aff6b0 Mon Sep 17 00:00:00 2001
From: Murai Takashi <tmurai01@gmail.com>
Date: Sat, 20 Jul 2013 07:21:58 +0900
Subject: [PATCH] Use delete[] instead of delete
---
src/apps/packageinstaller/PackageInfo.cpp | 40 ++++++++++++++---------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/apps/packageinstaller/PackageInfo.cpp b/src/apps/packageinstaller/PackageInfo.cpp
index 9354934..c94d49f 100644
a
|
b
|
PackageInfo::Parse()
|
255 | 255 | uint8 *compressed = new uint8[length]; |
256 | 256 | if (fPackageFile->Read(compressed, length) |
257 | 257 | != static_cast<int64>(length)) { |
258 | | delete compressed; |
| 258 | delete[] compressed; |
259 | 259 | RETURN_AND_SET_STATUS(B_ERROR); |
260 | 260 | } |
261 | 261 | |
… |
… |
PackageInfo::Parse()
|
263 | 263 | status_t ret = inflate_data(compressed, length, disclaimer, |
264 | 264 | original); |
265 | 265 | disclaimer[original] = 0; |
266 | | delete compressed; |
| 266 | delete[] compressed; |
267 | 267 | if (ret != B_OK) { |
268 | | delete disclaimer; |
| 268 | delete[] disclaimer; |
269 | 269 | RETURN_AND_SET_STATUS(B_ERROR); |
270 | 270 | } |
271 | 271 | |
272 | 272 | fDisclaimer = (char *)disclaimer; |
273 | | delete disclaimer; |
| 273 | delete[] disclaimer; |
274 | 274 | |
275 | 275 | continue; |
276 | 276 | } else if (!memcmp(buffer, splashScreenMarker, 7)) { |
… |
… |
PackageInfo::Parse()
|
291 | 291 | uint8 *compressed = new uint8[length]; |
292 | 292 | if (fPackageFile->Read(compressed, length) |
293 | 293 | != static_cast<int64>(length)) { |
294 | | delete compressed; |
| 294 | delete[] compressed; |
295 | 295 | RETURN_AND_SET_STATUS(B_ERROR); |
296 | 296 | } |
297 | 297 | |
… |
… |
PackageInfo::Parse()
|
299 | 299 | status_t ret = inflate_data(compressed, length, |
300 | 300 | static_cast<uint8 *>(const_cast<void *>(fImage.Buffer())), |
301 | 301 | original); |
302 | | delete compressed; |
| 302 | delete[] compressed; |
303 | 303 | if (ret != B_OK) { |
304 | 304 | RETURN_AND_SET_STATUS(B_ERROR); |
305 | 305 | } |
… |
… |
PackageInfo::Parse()
|
370 | 370 | fPackageFile->Read(name, length); |
371 | 371 | name[length] = 0; |
372 | 372 | group.name = name; |
373 | | delete name; |
| 373 | delete[] name; |
374 | 374 | } else if (!memcmp(buffer, "GrpD", 5)) { |
375 | 375 | if (!groupStarted) { |
376 | 376 | RETURN_AND_SET_STATUS(B_ERROR); |
… |
… |
PackageInfo::Parse()
|
385 | 385 | fPackageFile->Read(desc, length); |
386 | 386 | desc[length] = 0; |
387 | 387 | group.description = desc; |
388 | | delete desc; |
| 388 | delete[] desc; |
389 | 389 | } else if (!memcmp(buffer, "GrHt", 5)) { |
390 | 390 | if (!groupStarted) { |
391 | 391 | RETURN_AND_SET_STATUS(B_ERROR); |
… |
… |
PackageInfo::Parse()
|
465 | 465 | } |
466 | 466 | fDescription.Remove(0, i); |
467 | 467 | |
468 | | delete description; |
| 468 | delete[] description; |
469 | 469 | parser_debug("Description text reached\n"); |
470 | 470 | |
471 | 471 | // After this, there's a known size sequence of bytes, which |
… |
… |
PackageInfo::Parse()
|
494 | 494 | fPackageFile->Read(name, length); |
495 | 495 | name[length] = 0; |
496 | 496 | fName = name; |
497 | | delete name; |
| 497 | delete[] name; |
498 | 498 | } else if (!memcmp(buffer, versionMarker, 7)) { |
499 | 499 | parser_debug("Package version reached\n"); |
500 | 500 | fPackageFile->Read(&length, 4); |
… |
… |
PackageInfo::Parse()
|
505 | 505 | fPackageFile->Read(version, length); |
506 | 506 | version[length] = 0; |
507 | 507 | fVersion = version; |
508 | | delete version; |
| 508 | delete[] version; |
509 | 509 | } else if (!memcmp(buffer, devMarker, 7)) { |
510 | 510 | parser_debug("Package developer reached\n"); |
511 | 511 | fPackageFile->Read(&length, 4); |
… |
… |
PackageInfo::Parse()
|
516 | 516 | fPackageFile->Read(dev, length); |
517 | 517 | dev[length] = 0; |
518 | 518 | fDeveloper = dev; |
519 | | delete dev; |
| 519 | delete[] dev; |
520 | 520 | } else if (!memcmp(buffer, shortDescMarker, 7)) { |
521 | 521 | parser_debug("Package short description reached\n"); |
522 | 522 | fPackageFile->Read(&length, 4); |
… |
… |
PackageInfo::Parse()
|
527 | 527 | fPackageFile->Read(desc, length); |
528 | 528 | desc[length] = 0; |
529 | 529 | fShortDesc = desc; |
530 | | delete desc; |
| 530 | delete[] desc; |
531 | 531 | } else if (!memcmp(buffer, helpMarker, 7)) { |
532 | 532 | // The help text is a stored in deflated state, preceded by a 64 bit |
533 | 533 | // compressed size, 64 bit inflated size and a 32 bit integer |
… |
… |
PackageInfo::Parse()
|
564 | 564 | fPackageFile->Read(ti, length); |
565 | 565 | ti[length] = 0; |
566 | 566 | parser_debug("DQTi - %s\n", ti); |
567 | | delete ti; |
| 567 | delete[] ti; |
568 | 568 | } else if (!memcmp(buffer, "DQSz", 5)) { |
569 | 569 | parser_debug("DQSz\n"); |
570 | 570 | uint64 size; |
… |
… |
PackageInfo::Parse()
|
588 | 588 | fPackageFile->Read(signature, length); |
589 | 589 | signature[length] = 0; |
590 | 590 | parser_debug("DQMi - %s\n", signature); |
591 | | delete signature; |
| 591 | delete[] signature; |
592 | 592 | } else if (!memcmp(buffer, "PaNa", 5)) { |
593 | 593 | parser_debug("PaNa\n"); |
594 | 594 | fPackageFile->Read(&length, 4); |
… |
… |
PackageInfo::Parse()
|
602 | 602 | if (length > 0 && pathname[length - 1] == '/') |
603 | 603 | path->Remove(length - 1, 1); |
604 | 604 | userPaths.AddItem(path); |
605 | | delete pathname; |
| 605 | delete[] pathname; |
606 | 606 | } else if (!memcmp(buffer, padding, 7)) { |
607 | 607 | parser_debug("Padding!\n"); |
608 | 608 | continue; |
… |
… |
PackageInfo::Parse()
|
675 | 675 | name[length] = 0; |
676 | 676 | |
677 | 677 | nameString = name; |
678 | | delete name; |
| 678 | delete[] name; |
679 | 679 | } else if (!memcmp(buffer, "Grps", 5)) { |
680 | 680 | if (element == P_NONE) { |
681 | 681 | RETURN_AND_SET_STATUS(B_ERROR); |
… |
… |
PackageInfo::Parse()
|
763 | 763 | parser_debug("Mime: %s\n", mime); |
764 | 764 | |
765 | 765 | mimeString = mime; |
766 | | delete mime; |
| 766 | delete[] mime; |
767 | 767 | } else if (!memcmp(buffer, "CmpS", 5)) { |
768 | 768 | if (element == P_NONE) { |
769 | 769 | RETURN_AND_SET_STATUS(B_ERROR); |
… |
… |
PackageInfo::Parse()
|
821 | 821 | parser_debug("Signature: %s\n", signature); |
822 | 822 | |
823 | 823 | signatureString = signature; |
824 | | delete signature; |
| 824 | delete[] signature; |
825 | 825 | } else if (!memcmp(buffer, "Link", 5)) { |
826 | 826 | if (element != P_LINK) { |
827 | 827 | RETURN_AND_SET_STATUS(B_ERROR); |
… |
… |
PackageInfo::Parse()
|
837 | 837 | parser_debug("Link: %s\n", link); |
838 | 838 | |
839 | 839 | linkString = link; |
840 | | delete link; |
| 840 | delete[] link; |
841 | 841 | } else if (!memcmp(buffer, padding, 7)) { |
842 | 842 | PackageItem *item = NULL; |
843 | 843 | |