From 09b30ce415e2a2b126ea4d5ef899608d5b94e99b Mon Sep 17 00:00:00 2001 From: Peter Verthez Date: Mon, 9 Sep 2002 18:24:14 +0000 Subject: [PATCH] Better checking of library result values. --- gom/gom.c | 37 ++++++++++++++++++++++++++++--------- gom/gom_internal.h | 32 +++++++++++++++++++++++++++----- 2 files changed, 55 insertions(+), 14 deletions(-) diff --git a/gom/gom.c b/gom/gom.c index 2ddbb55..a0aa9d6 100644 --- a/gom/gom.c +++ b/gom/gom.c @@ -52,8 +52,8 @@ #include "gom.h" #include "gom_internal.h" -void gom_default_callback (Gedcom_elt elt, Gedcom_ctxt parent, int level, char* tag, - char* raw_value, int parsed_tag); +void gom_default_callback (Gedcom_elt elt, Gedcom_ctxt parent, int level, + char* tag, char* raw_value, int parsed_tag); void gom_cleanup() { @@ -98,16 +98,22 @@ int gom_parse_file(char* file_name) source_event_subscribe(); source_description_subscribe(); - atexit(gom_cleanup); + if (atexit(gom_cleanup) != 0) { + gedcom_warning(_("Could not register gom cleanup function")); + } return gedcom_parse_file(file_name); } Gom_ctxt make_gom_ctxt(int ctxt_type, OBJ_TYPE obj_type, void *ctxt_ptr) { Gom_ctxt ctxt = (Gom_ctxt)malloc(sizeof(struct Gom_ctxt_struct)); - ctxt->ctxt_type = ctxt_type; - ctxt->obj_type = obj_type; - ctxt->ctxt_ptr = ctxt_ptr; + if (! ctxt) + MEMORY_ERROR; + else { + ctxt->ctxt_type = ctxt_type; + ctxt->obj_type = obj_type; + ctxt->ctxt_ptr = ctxt_ptr; + } return ctxt; } @@ -117,7 +123,7 @@ void NULL_DESTROY(void* anything) void destroy_gom_ctxt(Gom_ctxt ctxt) { - free(ctxt); + SAFE_FREE(ctxt); } void gom_cast_error(char* file, int line, OBJ_TYPE expected, OBJ_TYPE found) @@ -128,6 +134,11 @@ void gom_cast_error(char* file, int line, OBJ_TYPE expected, OBJ_TYPE found) abort(); } +void gom_mem_error(char *filename, int line) +{ + gedcom_error(_("Could not allocate memory at %s, %d"), filename, line); +} + void gom_unexpected_context(char* file, int line, OBJ_TYPE found) { gedcom_warning(_("Internal error: Unexpected context at %s, line %d: %d"), @@ -207,7 +218,11 @@ struct date_value* dup_date(struct date_value dv) { struct date_value* dv_ptr; dv_ptr = (struct date_value*) malloc(sizeof(struct date_value)); - memcpy(dv_ptr, &dv, sizeof(struct date_value)); + if (! dv_ptr) + MEMORY_ERROR; + else { + memcpy(dv_ptr, &dv, sizeof(struct date_value)); + } return dv_ptr; } @@ -215,6 +230,10 @@ struct age_value* dup_age(struct age_value age) { struct age_value* age_ptr; age_ptr = (struct age_value*) malloc(sizeof(struct age_value)); - memcpy(age_ptr, &age, sizeof(struct age_value)); + if (! age_ptr) + MEMORY_ERROR; + else { + memcpy(age_ptr, &age, sizeof(struct age_value)); + } return age_ptr; } diff --git a/gom/gom_internal.h b/gom/gom_internal.h index 42dfa76..71c0bc6 100644 --- a/gom/gom_internal.h +++ b/gom/gom_internal.h @@ -117,8 +117,12 @@ struct age_value* dup_age(struct age_value age); #define MAKE_CHAIN_ELT(STRUCTTYPE, FIRSTVAL, VAL) \ { \ VAL = (struct STRUCTTYPE*) malloc(sizeof(struct STRUCTTYPE)); \ - memset (VAL, 0, sizeof(struct STRUCTTYPE)); \ - LINK_CHAIN_ELT(STRUCTTYPE, FIRSTVAL, VAL) \ + if (! VAL) \ + MEMORY_ERROR; \ + else { \ + memset (VAL, 0, sizeof(struct STRUCTTYPE)); \ + LINK_CHAIN_ELT(STRUCTTYPE, FIRSTVAL, VAL) \ + } \ } void NULL_DESTROY(void* anything); @@ -168,7 +172,13 @@ void NULL_DESTROY(void* anything); char *str = GEDCOM_STRING(parsed_value); \ struct STRUCTTYPE *obj \ = SAFE_CTXT_CAST(STRUCTTYPE, (Gom_ctxt)parent); \ - if (obj) obj->FIELD = strdup(str); \ + if (obj) { \ + obj->FIELD = strdup(str); \ + if (! obj->FIELD) { \ + MEMORY_ERROR; \ + return NULL; \ + } \ + } \ return (Gedcom_ctxt) MAKE_GOM_CTXT(elt, STRUCTTYPE, obj); \ } @@ -178,7 +188,13 @@ void NULL_DESTROY(void* anything); struct date_value dv = GEDCOM_DATE(parsed_value); \ struct STRUCTTYPE *obj \ = SAFE_CTXT_CAST(STRUCTTYPE, (Gom_ctxt)parent); \ - if (obj) obj->FIELD = dup_date(dv); \ + if (obj) { \ + obj->FIELD = dup_date(dv); \ + if (! obj->FIELD) { \ + MEMORY_ERROR; \ + return NULL; \ + } \ + } \ return (Gedcom_ctxt) MAKE_GOM_CTXT(elt, STRUCTTYPE, obj); \ } @@ -188,7 +204,13 @@ void NULL_DESTROY(void* anything); struct age_value age = GEDCOM_AGE(parsed_value); \ struct STRUCTTYPE *obj \ = SAFE_CTXT_CAST(STRUCTTYPE, (Gom_ctxt)parent); \ - if (obj) obj->FIELD = dup_age(age); \ + if (obj) { \ + obj->FIELD = dup_age(age); \ + if (! obj->FIELD) { \ + MEMORY_ERROR; \ + return NULL; \ + } \ + } \ return (Gedcom_ctxt) MAKE_GOM_CTXT(elt, STRUCTTYPE, obj); \ } -- 2.30.2