Merge pull request #6742 from RichardPalme/fix-bitmanip-count

fixed issue 19338 merged-on-behalf-of: Nathan Sashihara <n8sh@users.noreply.github.com>
dlang · Oct 30, 2018 · 9fcf1f1 · 9fcf1f1
2 parents 67cc148 + 9d7f453
commit 9fcf1f1
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/std/bitmanip.d b/std/bitmanip.d
@@ -1362,11 +1362,18 @@ public:
      */
     size_t count()
     {
-        size_t bitCount;
-        foreach (i; 0 .. fullWords)
-            bitCount += countBitsSet(_ptr[i]);
-        bitCount += countBitsSet(_ptr[fullWords] & endMask);
-        return bitCount;
+        if (_ptr)
+        {
+            size_t bitCount;
+            foreach (i; 0 .. fullWords)
+                bitCount += countBitsSet(_ptr[i]);
+            bitCount += countBitsSet(_ptr[fullWords] & endMask);
+            return bitCount;
+        }
+        else
+        {
+            return 0;
+        }
     }
 
     ///
@@ -1375,6 +1382,9 @@ public:
         auto a = BitArray([0, 1, 1, 0, 0, 1, 1]);
         assert(a.count == 4);
 
+        BitArray b;
+        assert(b.count == 0);
+
         bool[200] boolArray;
         boolArray[45 .. 130] = true;
         auto c = BitArray(boolArray);