Skip to content

Commit fa2dda4

Browse files
author
Sergej Jovanovic
authored
Merge pull request #21 from webrtc-uwp/Sergej/20190212-m71-arm
Resolved build issue for arm
2 parents 40f5bea + a68fe84 commit fa2dda4

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

windows/wrapper/override/cppwinrt/AudioData.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ void Org::WebRtc::implementation::AudioData::Data(Windows::Foundation::IMemoryBu
349349

350350
int16_t * const firstData = native_->mutableData();
351351

352-
memcpy(firstData, source, sizeof(int16_t)*passedSize);
352+
memcpy(firstData, source, SafeInt<size_t>(sizeof(int16_t) * passedSize));
353353
}
354354

355355
//------------------------------------------------------------------------------
@@ -380,7 +380,7 @@ uint64_t Org::WebRtc::implementation::AudioData::GetData(array_view<int16_t> val
380380
(!source))
381381
return 0;
382382

383-
memcpy(dest, source, sizeof(int16_t)*size);
383+
memcpy(dest, source, SafeInt<size_t>(sizeof(int16_t) * size));
384384

385385
return size;
386386
}
@@ -404,7 +404,7 @@ uint64_t Org::WebRtc::implementation::AudioData::SetData(array_view<int16_t cons
404404
(!source))
405405
return 0;
406406

407-
memcpy(dest, source, sizeof(int16_t)*size);
407+
memcpy(dest, source, SafeInt<size_t>(sizeof(int16_t) * size));
408408

409409
return size;
410410
}

windows/wrapper/override/cppwinrt/VideoData.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ uint64_t Org::WebRtc::implementation::VideoData::GetData8bit(array_view<uint8_t>
208208
(!source))
209209
return 0;
210210

211-
memcpy(dest, source, sizeof(uint8_t)*size);
211+
memcpy(dest, source, SafeInt<size_t>(sizeof(uint8_t) * size));
212212

213213
return size;
214214
}
@@ -231,7 +231,7 @@ uint64_t Org::WebRtc::implementation::VideoData::GetData16bit(array_view<uint16_
231231
(!source))
232232
return 0;
233233

234-
memcpy(dest, source, sizeof(uint16_t)*size);
234+
memcpy(dest, source, SafeInt<size_t>(sizeof(uint16_t) * size));
235235

236236
return size;
237237
}

0 commit comments

Comments
 (0)