summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Dobell <benjamin.dobell+github@glassechidna.com.au>2016-02-08 08:15:52 +0100
committerBenjamin Dobell <benjamin.dobell+github@glassechidna.com.au>2016-02-08 08:15:52 +0100
commit8e45fd81c97a40207035daf1c06019fcf40f8fba (patch)
treed2a2a0b67d23e278d350a0d4b228d249033b7750
parentDo not use static libusb-1.0 by default on Linux. (diff)
parentFixed libpit array overflows (diff)
downloadHeimdall-8e45fd81c97a40207035daf1c06019fcf40f8fba.tar
Heimdall-8e45fd81c97a40207035daf1c06019fcf40f8fba.tar.gz
Heimdall-8e45fd81c97a40207035daf1c06019fcf40f8fba.tar.bz2
Heimdall-8e45fd81c97a40207035daf1c06019fcf40f8fba.tar.lz
Heimdall-8e45fd81c97a40207035daf1c06019fcf40f8fba.tar.xz
Heimdall-8e45fd81c97a40207035daf1c06019fcf40f8fba.tar.zst
Heimdall-8e45fd81c97a40207035daf1c06019fcf40f8fba.zip
-rw-r--r--libpit/source/libpit.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/libpit/source/libpit.h b/libpit/source/libpit.h
index ccdea20..dbf731a 100644
--- a/libpit/source/libpit.h
+++ b/libpit/source/libpit.h
@@ -208,12 +208,12 @@ namespace libpit
void SetPartitionName(const char *partitionName)
{
// This isn't strictly necessary but ensures no junk is left in our PIT file.
- memset(this->partitionName, 0, 64);
+ memset(this->partitionName, 0, kPartitionNameMaxLength);
- if (strlen(partitionName) < 64)
+ if (strlen(partitionName) < kPartitionNameMaxLength)
strcpy(this->partitionName, partitionName);
else
- memcpy(this->partitionName, partitionName, 63);
+ memcpy(this->partitionName, partitionName, kPartitionNameMaxLength - 1);
}
const char *GetFlashFilename(void) const
@@ -226,10 +226,10 @@ namespace libpit
// This isn't strictly necessary but ensures no junk is left in our PIT file.
memset(this->flashFilename, 0, kFlashFilenameMaxLength);
- if (strlen(partitionName) < 32)
+ if (strlen(partitionName) < kFlashFilenameMaxLength)
strcpy(this->flashFilename, flashFilename);
else
- memcpy(this->flashFilename, flashFilename, 31);
+ memcpy(this->flashFilename, flashFilename, kFlashFilenameMaxLength - 1);
}
const char *GetFotaFilename(void) const
@@ -242,10 +242,10 @@ namespace libpit
// This isn't strictly necessary but ensures no junk is left in our PIT file.
memset(this->fotaFilename, 0, kFotaFilenameMaxLength);
- if (strlen(partitionName) < 32)
+ if (strlen(partitionName) < kFotaFilenameMaxLength)
strcpy(this->fotaFilename, fotaFilename);
else
- memcpy(this->fotaFilename, fotaFilename, 31);
+ memcpy(this->fotaFilename, fotaFilename, kFotaFilenameMaxLength - 1);
}
};