[kismac] [binaervarianz] r98 - in KisMACng: . Sources/Core

  • From: svn@xxxxxxxxxxxxxxxx
  • To: kismac@xxxxxxxxxxxxx
  • Date: Mon, 06 Mar 2006 07:58:16 +0100

Author: gkruse
Date: 2006-03-06 07:58:16 +0100 (Mon, 06 Mar 2006)
New Revision: 98

Modified:
   KisMACng/CHANGES
   KisMACng/Sources/Core/WaveStorageController.m
Log:
ASCII values below 32 are not valid in XML.  Fixes Google Earth Export.  Also 
use UTF-8 cString since that is what our encoding claims.
Closes #30


M    Sources/Core/WaveStorageController.m
M    CHANGES


Modified: KisMACng/CHANGES
===================================================================
--- KisMACng/CHANGES    2006-03-05 07:34:13 UTC (rev 97)
+++ KisMACng/CHANGES    2006-03-06 06:58:16 UTC (rev 98)
@@ -1,3 +1,5 @@
+R98: ASCII values below 32 are not valid in XML.  Fixes Google Earth Export.  
Also use UTF-8 cString since that is what our encoding claims to be.
+
 R97: Add option to enable Airport Extreme Monitor Mode forever
 
 R96: Fix Altivec WPA Wordlist crack on ppc that I broke in R91.  This 
accelerated wpa crack does not work on intel but I'll leave the code there in 
case anyone wants to investigate further.  Also added a words / sec status to 
the wpa crack dialog that I used for benchmarking while debigging this problem.

Modified: KisMACng/Sources/Core/WaveStorageController.m
===================================================================
--- KisMACng/Sources/Core/WaveStorageController.m       2006-03-05 07:34:13 UTC 
(rev 97)
+++ KisMACng/Sources/Core/WaveStorageController.m       2006-03-06 06:58:16 UTC 
(rev 98)
@@ -623,9 +623,10 @@
                
         if (sscanf([[net latitude] cString], "%f%c", &f, &c)==2) lat = f * (c 
== 'N' ? 1 : -1);                
         if (sscanf([[net longitude] cString], "%f%c", &f, &c)==2) lon = f * (c 
== 'E' ? 1 : -1);
-               strcpy(netname,[[net SSID] cString]);
+               strcpy(netname,[[net SSID] cStringUsingEncoding: 
NSUTF8StringEncoding]);
                
                // now escape any ampersands or < or >...
+        // also, ascii chars below ascii value 32 are not valid in xml so skip 
them
                
                netesc[0]='\0';
                
@@ -641,7 +642,13 @@
                                        strcat(netesc,"&gt;");
                                        break;
                                default:
-                                       strncat(netesc,netname+j,1);
+                    if (netname[j] < 32) {
+                        NSLog(@"KML Export: Invalid character found, 
skipping.");
+                    }
+                    else {
+                         strncat(netesc,netname+j,1);
+                    }
+
                        }
                }
                strcpy(netname,netesc);


Other related posts: