package_parser: remove redundant pkg size param Since the package is passed as a std::vector, that already describes the size of the package. Both 'update_manager.cpp' and 'item_update_manager.cpp' pass the size of the vector containing the package. Change-Id: I45b381a5ad5b4488a3db540f59f04f15402d264e Signed-off-by: Alexander Hansen <alexander.hansen@9elements.com>
diff --git a/fw-update/item_update_manager.cpp b/fw-update/item_update_manager.cpp index 6053a89..8eded1e 100644 --- a/fw-update/item_update_manager.cpp +++ b/fw-update/item_update_manager.cpp
@@ -58,7 +58,7 @@ } try { - parser->parse(buffer, buffer.size()); + parser->parse(buffer); } catch (const std::exception& e) {
diff --git a/fw-update/package_parser.cpp b/fw-update/package_parser.cpp index b8745f6..acbcb9d 100644 --- a/fw-update/package_parser.cpp +++ b/fw-update/package_parser.cpp
@@ -221,8 +221,10 @@ } } -void PackageParser::parse(const std::vector<uint8_t>& pkgHdr, uintmax_t pkgSize) +void PackageParser::parse(const std::vector<uint8_t>& pkgHdr) { + const uintmax_t pkgSize = pkgHdr.size(); + if (pkgHeaderSize >= pkgHdr.size()) { error("Invalid package header size '{PKG_HDR_SIZE}' ", "PKG_HDR_SIZE",
diff --git a/fw-update/package_parser.hpp b/fw-update/package_parser.hpp index ee3be56..3aeb2b2 100644 --- a/fw-update/package_parser.hpp +++ b/fw-update/package_parser.hpp
@@ -44,14 +44,13 @@ componentBitmapBitLength(componentBitmapBitLength) {} - /** @brief Parse the firmware update package header + /** @brief Parse the firmware update package * - * @param[in] pkgHdr - Package header - * @param[in] pkgSize - Size of the firmware update package + * @param[in] pkgHdr - Package * * @note Throws exception is parsing fails */ - void parse(const std::vector<uint8_t>& pkgHdr, uintmax_t pkgSize); + void parse(const std::vector<uint8_t>& pkgHdr); /** @brief Get firmware device ID records from the package *
diff --git a/fw-update/test/device_updater_test.cpp b/fw-update/test/device_updater_test.cpp index 93641b6..6dcc954 100644 --- a/fw-update/test/device_updater_test.cpp +++ b/fw-update/test/device_updater_test.cpp
@@ -53,7 +53,7 @@ package.seekg(0); - parser->parse(packageHeader, packageSize); + parser->parse(packageHeader); const auto& fwDeviceIDRecords = parser->getFwDeviceIDRecords(); const auto& testPkgCompImageInfos = parser->getComponentImageInfos();
diff --git a/fw-update/test/package_parser_test.cpp b/fw-update/test/package_parser_test.cpp index 003cb21..b8dc1e0 100644 --- a/fw-update/test/package_parser_test.cpp +++ b/fw-update/test/package_parser_test.cpp
@@ -52,7 +52,7 @@ EXPECT_EQ(parser->pkgHeaderSize, pkgHeaderSize); EXPECT_EQ(parser->pkgVersion, pkgVersion); - parser->parse(fwPkgHdr, pkgSize); + parser->parse(fwPkgHdr); auto outfwDeviceIDRecords = parser->getFwDeviceIDRecords(); FirmwareDeviceIDRecords fwDeviceIDRecords{ {1, @@ -128,7 +128,7 @@ EXPECT_EQ(parser->pkgHeaderSize, pkgHeaderSize); EXPECT_EQ(parser->pkgVersion, pkgVersion); - parser->parse(fwPkgHdr, pkgSize); + parser->parse(fwPkgHdr); auto outfwDeviceIDRecords = parser->getFwDeviceIDRecords(); FirmwareDeviceIDRecords fwDeviceIDRecords{ {1,
diff --git a/fw-update/update_manager.cpp b/fw-update/update_manager.cpp index 38782b1..273dfbb 100644 --- a/fw-update/update_manager.cpp +++ b/fw-update/update_manager.cpp
@@ -152,7 +152,7 @@ package.seekg(0); try { - parser->parse(packageHeader, packageSize); + parser->parse(packageHeader); } catch (const std::exception& e) {