diff --git a/src/core/object.c b/src/core/object.c
index 0205ed588f1e58a8afd727a99443c8037add9604..c39faf4aed2c89f684a3e2c0c947b0eba7fe2d18 100644 (file)
--- a/src/core/object.c
+++ b/src/core/object.c
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif /* HAVE_CONFIG_H */
+
#include "core/object.h"
#include <assert.h>
{
sdb_object_t *obj;
- if (type.size <= sizeof(sdb_object_t))
+ if (type.size < sizeof(sdb_object_t))
return NULL;
obj = malloc(type.size);
if (! obj)
return NULL;
memset(obj, 0, type.size);
+ obj->type = type;
if (name) {
obj->name = strdup(name);
}
}
- obj->type = type;
obj->ref_cnt = 1;
return obj;
} /* sdb_object_vcreate */
return obj;
} /* sdb_object_create */
+sdb_object_t *
+sdb_object_create_simple(const char *name, size_t size,
+ void (*destructor)(sdb_object_t *))
+{
+ sdb_type_t t = { size, NULL, destructor };
+ return sdb_object_create(name, t);
+} /* sdb_object_create_simple */
+
sdb_object_t *
sdb_object_create_wrapper(const char *name,
void *data, void (*destructor)(void *))
if (obj->ref_cnt > 0)
return;
+ /* we'd access free'd memory in case ref_cnt < 0 */
+ assert(! obj->ref_cnt);
+
if (obj->type.destroy)
obj->type.destroy(obj);