Merge branch 'master' of https://github.com/wordpress-mobile/wpxmlrpc

wordpress-mobile · Mar 21, 2014 · 1b7d521 · 1b7d521
2 parents 8229807 + 35ce25e
commit 1b7d521
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/WPXMLRPC/WPStringUtils.m b/WPXMLRPC/WPStringUtils.m
@@ -26,8 +26,12 @@
 @implementation WPStringUtils
 
 + (NSString *)unescapedStringWithString:(NSString *)aString {
+    if (!aString) {
+        return nil;
+    }
+
     NSMutableString *string = [NSMutableString stringWithString:aString];
-
+    
     [string replaceOccurrencesOfString:@"&quot;" withString:@"\"" options:NSLiteralSearch range:NSMakeRange(0, [string length])];
     [string replaceOccurrencesOfString:@"&#x27;" withString:@"'" options:NSLiteralSearch range:NSMakeRange(0, [string length])];
     [string replaceOccurrencesOfString:@"&#x39;" withString:@"'" options:NSLiteralSearch range:NSMakeRange(0, [string length])];
@@ -36,19 +40,23 @@ + (NSString *)unescapedStringWithString:(NSString *)aString {
     [string replaceOccurrencesOfString:@"&gt;" withString:@">" options:NSLiteralSearch range:NSMakeRange(0, [string length])];
     [string replaceOccurrencesOfString:@"&lt;" withString:@"<" options:NSLiteralSearch range:NSMakeRange(0, [string length])];
     [string replaceOccurrencesOfString:@"&amp;"  withString:@"&" options:NSLiteralSearch range:NSMakeRange(0, [string length])];
-
+    
     return [NSString stringWithString:string];
 }
 
 + (NSString *)escapedStringWithString:(NSString *)aString {
+    if (!aString) {
+        return nil;
+    }
+
     NSMutableString *string = [NSMutableString stringWithString:aString];
-
+    
     // NOTE:we use unicode entities instead of &amp; &gt; &lt; etc. since some hosts (powweb, fatcow, and similar)
     // have a weird PHP/libxml2 combination that ignores regular entities
     [string replaceOccurrencesOfString:@"&"  withString:@"&#38;" options:NSLiteralSearch range:NSMakeRange(0, [string length])];
     [string replaceOccurrencesOfString:@">"  withString:@"&#62;" options:NSLiteralSearch range:NSMakeRange(0, [string length])];
     [string replaceOccurrencesOfString:@"<"  withString:@"&#60;" options:NSLiteralSearch range:NSMakeRange(0, [string length])];
-
+    
     return [NSString stringWithString:string];
 }