Merge pull request #94 from DTW-Thalion/fix/cfcharacterset-range

CFCharacterSet: fix off-by-one in character range operations

Author: rfm

Source/CFCharacterSet.c

@@ -140,8 +140,11 @@ CFCharacterSetCreateWithCharactersInRange (CFAllocatorRef alloc,
     _kCFCharacterSetTypeID, CFCHARACTERSET_SIZE, 0);
   if (new)
     {
-      new->_uset = uset_open ((UChar32)range.location,
-        (UChar32)(range.location + range.length));
+      if (range.length <= 0)
+        new->_uset = uset_openEmpty ();
+      else
+        new->_uset = uset_open ((UChar32)range.location,
+          (UChar32)(range.location + range.length - 1));
       uset_freeze (new->_uset);
     }
 
@@ -378,8 +381,10 @@ void
 CFCharacterSetAddCharactersInRange (CFMutableCharacterSetRef set,
   CFRange range)
 {
+  if (range.length <= 0)
+    return;
   uset_addRange (set->_uset, (UChar32)range.location,
-    (UChar32)(range.location + range.length));
+    (UChar32)(range.location + range.length - 1));
 }
 
 void
@@ -393,8 +398,10 @@ void
 CFCharacterSetRemoveCharactersInRange (CFMutableCharacterSetRef set,
   CFRange range)
 {
+  if (range.length <= 0)
+    return;
   uset_removeRange (set->_uset, (UChar32)range.location,
-    (UChar32)(range.location + range.length));
+    (UChar32)(range.location + range.length - 1));
 }
 
 void

Tests/CFCharacterSet/range.m

@@ -0,0 +1,42 @@
+#include "CoreFoundation/CFCharacterSet.h"
+#include "../CFTesting.h"
+
+int main (void)
+{
+  CFCharacterSetRef s;
+  CFMutableCharacterSetRef m;
+
+  s = CFCharacterSetCreateWithCharactersInRange (NULL, CFRangeMake ('A', 3));
+  PASS_CF(CFCharacterSetIsCharacterMember (s, 'A')
+      && CFCharacterSetIsCharacterMember (s, 'C')
+      && !CFCharacterSetIsCharacterMember (s, 'D'),
+    "CFCharacterSetCreateWithCharactersInRange includes exactly the range.");
+  CFRelease (s);
+
+  s = CFCharacterSetCreateWithCharactersInRange (NULL, CFRangeMake ('A', 0));
+  PASS_CF(!CFCharacterSetIsCharacterMember (s, 'A'),
+    "CFCharacterSetCreateWithCharactersInRange of an empty range is empty.");
+  CFRelease (s);
+
+  s = CFCharacterSetCreateWithCharactersInRange (NULL, CFRangeMake (0x1F600, 1));
+  PASS_CF(CFCharacterSetIsLongCharacterMember (s, 0x1F600)
+      && !CFCharacterSetIsLongCharacterMember (s, 0x1F601),
+    "CFCharacterSetIsLongCharacterMember matches exactly a one-character range.");
+  CFRelease (s);
+
+  m = CFCharacterSetCreateMutable (NULL);
+  CFCharacterSetAddCharactersInRange (m, CFRangeMake ('0', 2));
+  PASS_CF(CFCharacterSetIsCharacterMember (m, '0')
+      && CFCharacterSetIsCharacterMember (m, '1')
+      && !CFCharacterSetIsCharacterMember (m, '2'),
+    "CFCharacterSetAddCharactersInRange adds exactly the range.");
+
+  CFCharacterSetAddCharactersInString (m, CFSTR("xy"));
+  CFCharacterSetRemoveCharactersInRange (m, CFRangeMake ('x', 1));
+  PASS_CF(!CFCharacterSetIsCharacterMember (m, 'x')
+      && CFCharacterSetIsCharacterMember (m, 'y'),
+    "CFCharacterSetRemoveCharactersInRange removes exactly the range.");
+  CFRelease (m);
+
+  return 0;
+}