Feature #2145
closedarray_get_unused_element returns correct data_type or NULL
Description
I developped a lighty module. In this module, I mixed up data_string, data_array within one array. Lighty sometimes crashed becasuse array_get_unused_element may return a node of wrong type. The parameter t is not used at all.
Before return, it should checks the data_type.
131 data_unset *array_get_unused_element(array *a, data_type_t t) {
132 data_unset *ds = NULL;
133
134 UNUSED;
135
136 if (a->size 0) return NULL;
137
138 if (a->used a->size) return NULL;
139
140 if (a->data[a->used]) {
141 ds = a->data[a->used];
142
143 a->data[a->used] = NULL;
144 }
145
+ if (ds && ds->type != t) {
+ ds->free(ds);
+ ds = NULL;
+ }
+
151 return ds;
152 }
Files
Updated by Tomte over 14 years ago
We solved this problem by not returning NULL if the current unused item does not have a matching type, but by searching the remaining unused elements for one with a matching type, switching positions of these two items and returning the found item now on the current position:
@@ -131,25 +133,44 @@
data_unset *array_get_unused_element(array *a, data_type_t t) {
data_unset *ds = NULL;
- UNUSED(t);
-
if (a->size == 0) return NULL;
if (a->used == a->size) return NULL;
if (a->data[a->used]) {
- ds = a->data[a->used];
+ ds = a->data[a->used];
- a->data[a->used] = NULL;
+ if(ds->type != t) {
+ //The type does not match...?
+ for (unsigned int i=(a->used + 1);i < a->size;i++) {
+ //We try to find the next matching element..
+ if(a->data[i] && a->data[i]->type == t) {
+ //make a copy....
+ data_unset *tmp = a->data[i];
+ //move the unmatching on it's postion
+ a->data[i] = ds;
+ //free the old position...
+ a->data[a->used] = NULL;
+ //and return the found..
+ return tmp;
+ }
+ }
+ //We didn't find any matching element... we return null!!!
+ return NULL;
+ } else {
+ a->data[a->used] = NULL;
+ }
}
+ UNUSED(t);
+
return ds;
}
Updated by stbuehler over 14 years ago
- Status changed from Patch Pending to Fixed
- % Done changed from 0 to 100
Applied in changeset r2750.
Also available in: Atom