Changeset 8816

Timestamp:

Sep 15, 2006, 4:38:25 AM (20 years ago)

Author:

rhl

Message:

1/ Fix off-by-one out-of-bound check (and ensure position >= 0)
2/ We only removed one element, so don't subtract (position-1)
elements from n.

Even with legal codes, error 2 followed by error 1 => SIGSEGV.

File:

• trunk/psLib/src/types/psArray.c (modified) (3 diffs)

trunk/psLib/src/types/psArray.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-09-12 21:55:49 $
+ *  @version $Revision: 1.52 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-09-15 14:38:25 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -164 +164 @@
     PS_ASSERT_PTR_NON_NULL(array, false);
 
-    if (position > array->n) {
+    if (position < 0 || position >= array->n) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
                 _("position > then the number of elements in the array."));
@@ -174 +174 @@
     psFree(array->data[i]);
     memmove(&array->data[i], &array->data[i + 1], (n - i - 1) * sizeof(psPtr));
-    array->n = --i; // reset the array size to indicate the removed item(s)
+    array->n--;    // reset the array size to indicate the removed item
 
     return true;