commit ed5ad88879731daec3abea279d6ce44f3ff72491
author Chung-yih Wang <cywang@google.com> Wed Sep 16 18:23:47 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 16 18:23:47 2009 -0700
tree 0f623be25bac5ec41a05d83d795c6cf88f825035
parent 0ac145a5d1e063b7a8cef5d1465c1f5747d957fd
parent 75d49fa78f02a95da0f36e3d0c7e23bf42e172c2

am 75d49fa7: am 20f16e25: Fix the assoication with SSID containing CJK characters.

Merge commit '75d49fa78f02a95da0f36e3d0c7e23bf42e172c2'

* commit '75d49fa78f02a95da0f36e3d0c7e23bf42e172c2':
  Fix the assoication with SSID containing CJK characters.

sta_dk_4_0_4_32/common/src/utils/utils.c

diff --git a/sta_dk_4_0_4_32/common/src/utils/utils.c b/sta_dk_4_0_4_32/common/src/utils/utils.c
index cd9ad9f..cf3c672 100644
--- a/sta_dk_4_0_4_32/common/src/utils/utils.c
+++ b/sta_dk_4_0_4_32/common/src/utils/utils.c
@@ -1617,9 +1617,10 @@
 
 	if (pSsid->len > 2)
 	{
-		if ((pSsid->ssidString[0] < FIRST_VALID_CHAR) &&
-			(pSsid->ssidString[1] < FIRST_VALID_CHAR) &&
-			(pSsid->ssidString[2] < FIRST_VALID_CHAR))
+                unsigned char *ssidString = (unsigned char *)pSsid->ssidString;
+		if ((ssidString[0] < FIRST_VALID_CHAR) &&
+			(ssidString[1] < FIRST_VALID_CHAR) &&
+			(ssidString[2] < FIRST_VALID_CHAR))
 		{
 			return TRUE;
 		}
@@ -2015,5 +2016,3 @@
 
 
 #endif /* UTIL_DEBUG_PROFILE */
-
-