Merge "Check maximum allowed download size for download command."
This commit is contained in:
commit
f7d154e10f
|
@ -176,7 +176,7 @@ bool DownloadHandler(FastbootDevice* device, const std::vector<std::string>& arg
|
|||
|
||||
// arg[0] is the command name, arg[1] contains size of data to be downloaded
|
||||
unsigned int size;
|
||||
if (!android::base::ParseUint("0x" + args[1], &size, UINT_MAX)) {
|
||||
if (!android::base::ParseUint("0x" + args[1], &size, kMaxDownloadSizeDefault)) {
|
||||
return device->WriteStatus(FastbootResult::FAIL, "Invalid size");
|
||||
}
|
||||
device->download_data().resize(size);
|
||||
|
|
|
@ -19,6 +19,8 @@
|
|||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
constexpr unsigned int kMaxDownloadSizeDefault = 0x20000000;
|
||||
|
||||
class FastbootDevice;
|
||||
|
||||
enum class FastbootResult {
|
||||
|
|
|
@ -36,7 +36,6 @@ using ::android::hardware::fastboot::V1_0::FileSystemType;
|
|||
using ::android::hardware::fastboot::V1_0::Result;
|
||||
using ::android::hardware::fastboot::V1_0::Status;
|
||||
|
||||
constexpr int kMaxDownloadSizeDefault = 0x20000000;
|
||||
constexpr char kFastbootProtocolVersion[] = "0.4";
|
||||
|
||||
bool GetVersion(FastbootDevice* /* device */, const std::vector<std::string>& /* args */,
|
||||
|
|
Loading…
Reference in New Issue