diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2014-07-28 01:43:22 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2014-07-28 01:43:22 +0000 |
| commit | 3f1b436f1cdb8a30d9e67920d51836a2cf7f7e95 (patch) | |
| tree | 08c3b0763a834ed1d265691211bafb37313a100d | |
| parent | 10511d890b8769ad4a7fdbddecfb7bfb605d03cb (diff) | |
Re #1751 (misc): Fixed incorrect usage of dev_size (should be dev_count) in coreaudio device
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4883 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjmedia/src/pjmedia-audiodev/coreaudio_dev.m | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pjmedia/src/pjmedia-audiodev/coreaudio_dev.m b/pjmedia/src/pjmedia-audiodev/coreaudio_dev.m index f86aaa37..bddd125c 100644 --- a/pjmedia/src/pjmedia-audiodev/coreaudio_dev.m +++ b/pjmedia/src/pjmedia-audiodev/coreaudio_dev.m @@ -433,10 +433,9 @@ static pj_status_t ca_factory_refresh(pjmedia_aud_dev_factory *f) dev_count)); /* Get all the audio device IDs */ - dev_ids = (AudioDeviceID *)pj_pool_calloc(cf->pool, dev_size, size); + dev_ids = (AudioDeviceID *)pj_pool_calloc(cf->pool, dev_count, size); if (!dev_ids) return PJ_ENOMEM; - pj_bzero(dev_ids, dev_count); ostatus = AudioObjectGetPropertyData(kAudioObjectSystemObject, &addr, 0, NULL, &dev_size, (void *)dev_ids); @@ -463,7 +462,7 @@ static pj_status_t ca_factory_refresh(pjmedia_aud_dev_factory *f) if (ostatus == noErr && dev_id != dev_ids[idx]) { AudioDeviceID temp_id = dev_ids[idx]; - for (i = idx + 1; i < dev_size; i++) { + for (i = idx + 1; i < dev_count; i++) { if (dev_ids[i] == dev_id) { dev_ids[idx++] = dev_id; dev_ids[i] = temp_id; @@ -480,7 +479,7 @@ static pj_status_t ca_factory_refresh(pjmedia_aud_dev_factory *f) if (ostatus == noErr && dev_id != dev_ids[idx]) { AudioDeviceID temp_id = dev_ids[idx]; - for (i = idx + 1; i < dev_size; i++) { + for (i = idx + 1; i < dev_count; i++) { if (dev_ids[i] == dev_id) { dev_ids[idx] = dev_id; dev_ids[i] = temp_id; |