averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a pontential buffer overflow when allocating a SILWitnessTable object.

Browse Source 
Swift SVN r12719
This commit is contained in:
Argyrios Kyrtzidis
2014-01-22 07:10:33 +00:00
parent 980b941c60
commit 8960a7fff7
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/SIL/SILWitnessTable.cpp
View File

@@ -27,8 +27,10 @@ using namespace swift;
SILWitnessTable *SILWitnessTable::create(SILModule &M,
NormalProtocolConformance *Conformance,
ArrayRef<SILWitnessTable::Entry> entries) {
void *buf = M.allocate(sizeof(SILWitnessTable)
+ sizeof(Entry) * (entries.size()-1),
// FIXME: Is it valid to get an empty array ?
size_t AdditionalEntriesSize =
entries.empty() ? 0 : sizeof(Entry) * (entries.size()-1);
void *buf = M.allocate(sizeof(SILWitnessTable) + AdditionalEntriesSize,
alignof(SILWitnessTable));
SILWitnessTable *wt = ::new (buf) SILWitnessTable(Conformance, entries);
M.witnessTables.push_back(wt);