X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=blobdiff_plain;f=osl.c;h=66661969e3720193d7f7af4c5295ee02d8db13d5;hp=4569b1bcf4810e1533c8283f1e72ae06d6f858e8;hb=995d35b6530fc34e706f492bf356c4415d4ac503;hpb=1cb173045c9bbc707407021860a74a2dbc01af65

diff --git a/osl.c b/osl.c
index 4569b1b..6666196 100644
--- a/osl.c
+++ b/osl.c
@@ -277,6 +277,9 @@ int init_table_structure(const struct osl_table_description *desc,
 		ret = -E_OSL_BAD_STORAGE_FLAGS;
 		if (st == OSL_DISK_STORAGE && sf & OSL_RBTREE)
 			goto err;
+		if ((sf & OSL_RBTREE) && !(sf & OSL_UNIQUE))
+			WARNING_LOG("invalid storage flags for column %s: "
+				"OSL_RBTREE && !OSL_UNIQUE\n", cd->name);
 		ret = -E_OSL_BAD_STORAGE_SIZE;
 		if (sf & OSL_FIXED_SIZE && !cd->data_size)
 			goto err;
@@ -1569,7 +1572,8 @@ __export int osl_update_object(struct osl_table *t, const struct osl_row *r,
 	}
 	remove_rb_node(t, col_num, r);
 	if (cd->storage_type == OSL_NO_STORAGE) { /* TODO: If fixed size, reuse object? */
-		free(r->volatile_objects[col->volatile_num].data);
+		if (!(cd->storage_flags & OSL_DONT_FREE))
+			free(r->volatile_objects[col->volatile_num].data);
 		r->volatile_objects[col->volatile_num] = *obj;
 	} else if (cd->storage_type == OSL_DISK_STORAGE) {
 		char *ds_name;
@@ -1698,6 +1702,7 @@ __export int osl_get_nth_row(const struct osl_table *t, unsigned col_num,
 	unsigned num_rows;
 	int ret;
 
+	*result = NULL;
 	if (n == 0)
 		return -E_OSL_RB_KEY_NOT_FOUND;
 	ret = osl_get_num_rows(t, &num_rows);