X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fobject.c;h=c39faf4aed2c89f684a3e2c0c947b0eba7fe2d18;hp=43bb22a8fbf83ee39cb781beab8e34426f9505e9;hb=b75718ea9fe4d6c90f1794e517a0712729553c0c;hpb=9b4a5ef2a407895415153f78b69a954ed414715b diff --git a/src/core/object.c b/src/core/object.c index 43bb22a..c39faf4 100644 --- a/src/core/object.c +++ b/src/core/object.c @@ -25,6 +25,10 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#if HAVE_CONFIG_H +# include "config.h" +#endif /* HAVE_CONFIG_H */ + #include "core/object.h" #include @@ -78,7 +82,7 @@ sdb_object_vcreate(const char *name, sdb_type_t type, va_list ap) { sdb_object_t *obj; - if (type.size <= sizeof(sdb_object_t)) + if (type.size < sizeof(sdb_object_t)) return NULL; obj = malloc(type.size); @@ -120,6 +124,14 @@ sdb_object_create(const char *name, sdb_type_t type, ...) 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 *)) @@ -137,6 +149,9 @@ sdb_object_deref(sdb_object_t *obj) 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);