Permalink
Browse files

Merge remote-tracking branch 'upstream/ThreeOneOne'

  • Loading branch information...
2 parents aaec9be + b26c567 commit ac8d371485c06a5866aa76c445e7a15c2e85e347 @andersmalm andersmalm committed Sep 5, 2012
Showing with 2 additions and 0 deletions.
  1. +2 −0 runtimes/cpp/base/Syscall.cpp
@@ -986,6 +986,7 @@ namespace Base {
#if !defined(_android)
int Syscall::maBtGetNewDevice(MABtDevice* dst) {
MABtDeviceNative dn;
+ dn.nameBufSize = dst->nameBufSize;
dn.name = (char*)GetValidatedMemRange(dst->name, dst->nameBufSize);
int res = BLUETOOTH(maBtGetNewDevice)(&dn);
dst->actualNameLength = dn.actualNameLength;
@@ -999,6 +1000,7 @@ namespace Base {
if(res <= 0)
return res;
MABtServiceNative sn;
+ sn.nameBufSize = dst->nameBufSize;
sn.name = (char*)GetValidatedMemRange(dst->name, dst->nameBufSize);
sn.uuids = (MAUUID*)GetValidatedMemRange(dst->uuids, ss.nUuids * sizeof(MAUUID));
res = BLUETOOTH(maBtGetNewService)(&sn);

0 comments on commit ac8d371

Please sign in to comment.