lix-project/lix
20
57
Fork 31
Code Issues 349 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge pull request #4008 from aszlig/fix-ub-in-reading-ca-map

Browse source 
Fix unspecified behaviour in readStorePathCAMap
This commit is contained in:
Eelco Dolstra 2020-09-14 13:18:52 +02:00 committed by GitHub
parent 7cb5f643a6 525b38eee8
commit 8ebd10664e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libstore/remote-store.cc
View file

@ -43,8 +43,11 @@ StorePathCAMap readStorePathCAMap(const Store & store, Source & from)
{ {
StorePathCAMap paths; StorePathCAMap paths;
auto count = readNum<size_t>(from); auto count = readNum<size_t>(from);
while (count--) while (count--) {
paths.insert_or_assign(store.parseStorePath(readString(from)), parseContentAddressOpt(readString(from))); auto path = store.parseStorePath(readString(from));
auto ca = parseContentAddressOpt(readString(from));
paths.insert_or_assign(path, ca);
}
return paths; return paths;
} }