Changeset 965 for trunk/psLib/src/collections/psBitSet.c

Timestamp:

Jun 9, 2004, 2:29:09 PM (22 years ago)

Author:

harman

Message:

Added more error checks

File:

• trunk/psLib/src/collections/psBitSet.c (modified) (6 diffs)

trunk/psLib/src/collections/psBitSet.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-09 21:18:24 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 00:29:09 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -22 +22 @@
 #include <stdio.h>
 #include <ctype.h>
+#include <math.h>
 
 #include "psBitSet.h"
@@ -77 +78 @@
 psBitSet* psBitSetAlloc(int n)
 {
+    int numBytes = 0;
     psBitSet *newObj = NULL;
 
@@ -84 +86 @@
     }
 
+    numBytes = ceil(n/8.0);
     newObj = psAlloc(sizeof(psBitSet));
-    newObj->n = n;
+    newObj->n = numBytes;
 
     // Ignore splint warning about releasing pointer members, since they've not been allocated yet
     /*@i@*/
-    newObj->bits = psAlloc(sizeof(char)*n);
-    memset(newObj->bits, n, 0);
+    newObj->bits = psAlloc(sizeof(char)*numBytes);
+    memset(newObj->bits, numBytes, 0);
 
     return newObj;
@@ -113 +116 @@
         return inBitSet;
     } else if(bit < 0) {
-        psError(__func__, " : Line %d - Negative bit position not allowed: %d\n", __LINE__, bit);
+        psError(__func__, " : Line %d - Bit position too small: %d\n", __LINE__, bit);
+        return inBitSet;
+    } else if(bit > inBitSet->n*8-1) {
+        psError(__func__, " : Line %d - Bit position too large: %d\n", __LINE__, bit);
         return inBitSet;
     }
@@ -132 +138 @@
         return 0;
     } else if(bit < 0) {
-        psError(__func__, " : Line %d - Negative bit position not allowed: %d\n", __LINE__, bit);
+        psError(__func__, " : Line %d - Bit position too small: %d\n", __LINE__, bit);
+        return 0;
+    } else if(bit > inBitSet->n*8-1) {
+        psError(__func__, " : Line %d - Bit position too large: %d\n", __LINE__, bit);
         return 0;
     }