2 files changed, 11 insertions, 0 deletions
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py b/lldb/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py
index 0c38211d202..73f9f5f9088 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py
@@ -102,6 +102,10 @@ class NSStringDataFormatterTestCase(TestBase):
         self.expect('expr -d run-target -- path',substrs = ['usr/blah/stuff'])
         self.expect('frame variable path',substrs = ['usr/blah/stuff'])
 
+        self.expect('po strwithNULs', substrs=['a very much boring task to write'])
+        self.expect('expr [strwithNULs length]', substrs=['54'])
+        self.expect('frame variable strwithNULs', substrs=['@"a very much boring task to write\\0a string this way!!'])
+
 if __name__ == '__main__':
     import atexit
     lldb.SBDebugger.Initialize()
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-objc/nsstring/main.m b/lldb/test/functionalities/data-formatter/data-formatter-objc/nsstring/main.m
index 1d6a627d9df..14b9200339a 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-objc/nsstring/main.m
+++ b/lldb/test/functionalities/data-formatter/data-formatter-objc/nsstring/main.m
@@ -79,6 +79,13 @@ int main (int argc, const char * argv[])
 	NSArray *components = @[@"usr", @"blah", @"stuff"];
 	NSString *path = [NSString pathWithComponents: components];
 
+  const unichar someOfTheseAreNUL[] = {'a',' ', 'v','e','r','y',' ',
+      'm','u','c','h',' ','b','o','r','i','n','g',' ','t','a','s','k',
+      ' ','t','o',' ','w','r','i','t','e', 0, 'a', ' ', 's', 't', 'r', 'i', 'n', 'g', ' ',
+      't','h','i','s',' ','w','a','y','!','!', 0x03C3, 0};
+  NSString *strwithNULs = [NSString stringWithCharacters: someOfTheseAreNUL
+                                           length: sizeof someOfTheseAreNUL / sizeof *someOfTheseAreNUL];
+
     [pool drain]; // break here
     return 0;
 }