X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcore%2Fobject.c;h=c39faf4aed2c89f684a3e2c0c947b0eba7fe2d18;hb=b50c58aac035dbb91b5bc85b579aa559d010dff4;hp=9d10f9831720ba8eaf310d3f83227c8572025df1;hpb=39a45905e0b237e458b1826ff9b4fad1c4a59550;p=sysdb.git diff --git a/src/core/object.c b/src/core/object.c index 9d10f98..c39faf4 100644 --- a/src/core/object.c +++ b/src/core/object.c @@ -82,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); @@ -125,9 +125,10 @@ sdb_object_create(const char *name, sdb_type_t type, ...) } /* sdb_object_create */ sdb_object_t * -sdb_object_create_simple(const char *name, size_t size) +sdb_object_create_simple(const char *name, size_t size, + void (*destructor)(sdb_object_t *)) { - sdb_type_t t = { size, NULL, NULL }; + sdb_type_t t = { size, NULL, destructor }; return sdb_object_create(name, t); } /* sdb_object_create_simple */ @@ -148,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);