Skip to content

Fix SSID UTF8 Encoding #317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 3, 2025
Merged

Fix SSID UTF8 Encoding #317

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ee5468
Fix SSID UTF8 Encoding
Sep 1, 2025
f80508d
Update System.Device.Wifi/WifiAdapter.cs
alberk8 Sep 1, 2025
d4f1c64
Style
Sep 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions System.Device.Wifi/WifiAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

using System;
using System.Runtime.CompilerServices;
using System.Text;

namespace System.Device.Wifi
{
Expand Down Expand Up @@ -91,14 +92,16 @@ private WifiAvailableNetwork[] ParseNativeReports(byte[] nativeReport)
WifiNetworks[index].Bsid = BitConverter.ToString(nativeReport, bytePos, 6);
bytePos += 6;

// need to convert this programmatically to prevent referencing System.Text
char[] rawSsid = new char[33];
for (int i = 0; i < 33; i++)
byte[] rawSsid = new byte[33];
Array.Copy(nativeReport, bytePos, rawSsid, 0, 33);

int ssidLength = Array.IndexOf(rawSsid, (byte)0);
if (ssidLength < 0)
{
rawSsid[i] = (char)nativeReport[bytePos + i];
ssidLength = 33;
}

WifiNetworks[index].Ssid = new string(rawSsid, 0, 33);
WifiNetworks[index].Ssid = Encoding.UTF8.GetString(rawSsid, 0, ssidLength);
bytePos += 33;

WifiNetworks[index]._rssi = (sbyte)nativeReport[bytePos];
Expand Down