Skip to content

Commit 403768c

Browse files
committed
Fix integer overflow in Fat Mach-O header size checks and catch exceptions in transform callbacks.
1 parent 547ae57 commit 403768c

3 files changed

Lines changed: 79 additions & 27 deletions

File tree

‎transform.cpp‎

Lines changed: 77 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -76,52 +76,104 @@ void Transform::FreeParametersCallback(BNTransformParameterInfo* params, size_t
7676
bool Transform::DecodeCallback(
7777
void* ctxt, BNDataBuffer* input, BNDataBuffer* output, BNTransformParameter* params, size_t paramCount)
7878
{
79-
map<string, DataBuffer> paramMap;
80-
for (size_t i = 0; i < paramCount; i++)
81-
paramMap[params[i].name] = DataBuffer(BNDuplicateDataBuffer(params[i].value));
79+
try
80+
{
81+
map<string, DataBuffer> paramMap;
82+
for (size_t i = 0; i < paramCount; i++)
83+
paramMap[params[i].name] = DataBuffer(BNDuplicateDataBuffer(params[i].value));
8284

83-
DataBuffer inputBuf(BNDuplicateDataBuffer(input));
84-
DataBuffer outputBuf;
85+
DataBuffer inputBuf(BNDuplicateDataBuffer(input));
86+
DataBuffer outputBuf;
8587

86-
CallbackRef<Transform> xform(ctxt);
87-
bool result = xform->Decode(inputBuf, outputBuf, paramMap);
88-
BNAssignDataBuffer(output, outputBuf.GetBufferObject());
89-
return result;
88+
CallbackRef<Transform> xform(ctxt);
89+
bool result = xform->Decode(inputBuf, outputBuf, paramMap);
90+
BNAssignDataBuffer(output, outputBuf.GetBufferObject());
91+
return result;
92+
}
93+
catch (const std::exception& e)
94+
{
95+
LogError("Transform::Decode failed: %s", e.what());
96+
return false;
97+
}
98+
catch (...)
99+
{
100+
LogError("Transform::Decode failed with unknown exception");
101+
return false;
102+
}
90103
}
91104

92105

93106
bool Transform::EncodeCallback(
94107
void* ctxt, BNDataBuffer* input, BNDataBuffer* output, BNTransformParameter* params, size_t paramCount)
95108
{
96-
map<string, DataBuffer> paramMap;
97-
for (size_t i = 0; i < paramCount; i++)
98-
paramMap[params[i].name] = DataBuffer(BNDuplicateDataBuffer(params[i].value));
109+
try
110+
{
111+
map<string, DataBuffer> paramMap;
112+
for (size_t i = 0; i < paramCount; i++)
113+
paramMap[params[i].name] = DataBuffer(BNDuplicateDataBuffer(params[i].value));
99114

100-
DataBuffer inputBuf(BNDuplicateDataBuffer(input));
101-
DataBuffer outputBuf;
115+
DataBuffer inputBuf(BNDuplicateDataBuffer(input));
116+
DataBuffer outputBuf;
102117

103-
CallbackRef<Transform> xform(ctxt);
104-
bool result = xform->Encode(inputBuf, outputBuf, paramMap);
105-
BNAssignDataBuffer(output, outputBuf.GetBufferObject());
106-
return result;
118+
CallbackRef<Transform> xform(ctxt);
119+
bool result = xform->Encode(inputBuf, outputBuf, paramMap);
120+
BNAssignDataBuffer(output, outputBuf.GetBufferObject());
121+
return result;
122+
}
123+
catch (const std::exception& e)
124+
{
125+
LogError("Transform::Encode failed: %s", e.what());
126+
return false;
127+
}
128+
catch (...)
129+
{
130+
LogError("Transform::Encode failed with unknown exception");
131+
return false;
132+
}
107133
}
108134

109135

110136
bool Transform::DecodeWithContextCallback(void* ctxt, BNTransformContext* context, BNTransformParameter* params, size_t paramCount)
111137
{
112-
map<string, DataBuffer> paramMap;
113-
for (size_t i = 0; i < paramCount; i++)
114-
paramMap[params[i].name] = DataBuffer(BNDuplicateDataBuffer(params[i].value));
138+
try
139+
{
140+
map<string, DataBuffer> paramMap;
141+
for (size_t i = 0; i < paramCount; i++)
142+
paramMap[params[i].name] = DataBuffer(BNDuplicateDataBuffer(params[i].value));
115143

116-
CallbackRef<Transform> xform(ctxt);
117-
return xform->DecodeWithContext(new TransformContext(BNNewTransformContextReference(context)), paramMap);
144+
CallbackRef<Transform> xform(ctxt);
145+
return xform->DecodeWithContext(new TransformContext(BNNewTransformContextReference(context)), paramMap);
146+
}
147+
catch (const std::exception& e)
148+
{
149+
LogError("Transform::DecodeWithContext failed: %s", e.what());
150+
return false;
151+
}
152+
catch (...)
153+
{
154+
LogError("Transform::DecodeWithContext failed with unknown exception");
155+
return false;
156+
}
118157
}
119158

120159

121160
bool Transform::CanDecodeCallback(void* ctxt, BNBinaryView* input)
122161
{
123-
CallbackRef<Transform> xform(ctxt);
124-
return xform->CanDecode(new BinaryView(BNNewViewReference(input)));
162+
try
163+
{
164+
CallbackRef<Transform> xform(ctxt);
165+
return xform->CanDecode(new BinaryView(BNNewViewReference(input)));
166+
}
167+
catch (const std::exception& e)
168+
{
169+
LogError("Transform::CanDecode failed: %s", e.what());
170+
return false;
171+
}
172+
catch (...)
173+
{
174+
LogError("Transform::CanDecode failed with unknown exception");
175+
return false;
176+
}
125177
}
126178

127179

‎view/macho/fatmachoview.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ static bool ExtractFatArchForCPU(BinaryView* data, fat_arch_64& arch, cpu_type_t
8787
header.nfat_arch = reader.Read32();
8888

8989
// Malformed header, too many archs
90-
size_t expectSize = header.nfat_arch * (fat64 ? 32 /* sizeof(fat_arch_64) */ : 20 /* sizeof(fat_arch) */) + 8 /* sizeof(fat_header) */;
90+
size_t expectSize = (size_t)header.nfat_arch * (fat64 ? 32 /* sizeof(fat_arch_64) */ : 20 /* sizeof(fat_arch) */) + 8 /* sizeof(fat_header) */;
9191
if (expectSize > data->GetLength())
9292
{
9393
return false;

‎view/macho/universaltransform.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ bool UniversalTransform::ParseHeaders(Ref<BinaryView> data, FatHeader& fatHeader
124124
fatHeader.nfat_arch = reader.Read32();
125125

126126
isFat64 = (fatHeader.magic == FAT_MAGIC_64);
127-
size_t requiredFatHeaderSize = fatHeader.nfat_arch * (isFat64 ? 32 : 20) + 8;
127+
size_t requiredFatHeaderSize = (size_t)fatHeader.nfat_arch * (isFat64 ? 32 : 20) + 8;
128128
if (requiredFatHeaderSize > data->GetLength())
129129
{
130130
errorMsg = "Universal (Fat Mach-O): header truncated";

0 commit comments

Comments
 (0)