epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11183 from Mailaender/query-device-nre

Browse Source 
Fixed a NullReferenceException in OpenAL QueryDevices
This commit is contained in:
Oliver Brakmann
2016-05-24 21:47:02 +02:00
parent 363a15f0b5 f22bc68d94
commit 86620888fd
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenRA.Platforms.Default/OpenAlSoundEngine.cs
View File

@@ -13,6 +13,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using OpenAL;
namespace OpenRA.Platforms.Default
@@ -56,19 +57,19 @@ namespace OpenRA.Platforms.Default
var devices = new List<string>();
var next = ALC10.alcGetString(IntPtr.Zero, type);
do
{
var str = Marshal.PtrToStringAnsi(next);
next += str.Length + 1;
devices.Add(str);
} while (Marshal.ReadByte(next) != 0);
if (AL10.alGetError() != AL10.AL_NO_ERROR)
if (next == IntPtr.Zero || AL10.alGetError() != AL10.AL_NO_ERROR)
{
Log.Write("sound", "Failed to query OpenAL device list using {0}", label);
return new string[] { };
}
do
{
var str = Marshal.PtrToStringAuto(next);
next += UnicodeEncoding.Default.GetByteCount(str) + 1;
devices.Add(str);
} while (Marshal.ReadByte(next) != 0);
return devices.ToArray();
}