gitea-mirror/git-crypt
1
0
Fork 0
mirror of https://github.com/AGWA/git-crypt.git synced 2025-12-25 12:24:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

Avoid possible undefined behavior with empty std::vector

Browse Source 
In particular, &bytes[0] is undefined if bytes is empty.
This commit is contained in:
Andrew Ayer
2014-08-18 14:11:37 -07:00
parent b07f49b9b3
commit 8b159b543f
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
key.cpp
View File

@@ -209,12 +209,18 @@ void Key_file::load_header (std::istream& in)
if (field_len > KEY_NAME_MAX_LEN) {
throw Malformed();
}
std::vector<char> bytes(field_len);
in.read(&bytes[0], field_len);
if (in.gcount() != static_cast<std::streamsize>(field_len)) {
throw Malformed();
if (field_len == 0) {
// special case field_len==0 to avoid possible undefined behavior
// edge cases with an empty std::vector (particularly, &bytes[0]).
key_name.clear();
} else {
std::vector<char> bytes(field_len);
in.read(&bytes[0], field_len);
if (in.gcount() != static_cast<std::streamsize>(field_len)) {
throw Malformed();
}
key_name.assign(&bytes[0], field_len);
}
key_name.assign(&bytes[0], field_len);
if (!validate_key_name(key_name.c_str())) {
key_name.clear();
throw Malformed();