Correct sub_note_end callback: parsed value can be NULL.

[gedcom-parse.git] / gom / note_sub.c

diff --git a/gom/note_sub.c b/gom/note_sub.c
index 5af12ca621fe3f83c92329b80f7568cdb0392bdc..e523b32ba120dc0cece1800f11f24642d0922180 100644 (file)
--- a/gom/note_sub.c
+++ b/gom/note_sub.c
@@ -52,11 +52,8 @@ Gedcom_ctxt sub_note_start(_ELT_PARAMS_)
   if (! ctxt)
     NO_CONTEXT;
   else {
-    struct note_sub *note = (struct note_sub *)malloc(sizeof(struct note_sub));
-    if (! note)
-      MEMORY_ERROR;
-    else {
-      memset (note, 0, sizeof(struct note_sub));
+    struct note_sub *note = SUB_MAKEFUNC(note_sub)();
+    if (note) {
       if (GEDCOM_IS_XREF_PTR(parsed_value))
        note->reference = GEDCOM_XREF_PTR(parsed_value);
 
@@ -113,8 +110,29 @@ Gedcom_ctxt sub_note_start(_ELT_PARAMS_)
   return (Gedcom_ctxt)result;
 }
 
-DEFINE_STRING_END_CB(note_sub, sub_note_end, text)
+void sub_note_end(_ELT_END_PARAMS_)
+{
+  if (GEDCOM_IS_STRING(parsed_value)) {
+    Gom_ctxt ctxt = (Gom_ctxt)self;
+    if (! ctxt)
+      NO_CONTEXT;
+    else {
+      struct note_sub *obj = SAFE_CTXT_CAST(note_sub, ctxt);
+      if (obj) {
+       char *str = GEDCOM_STRING(parsed_value);
+       char *newvalue = strdup(str);
+       if (! newvalue)
+         MEMORY_ERROR;
+       else
+         obj->text = newvalue;
+      }
+      destroy_gom_ctxt(ctxt);
+    }
+  }
+}
 
+DEFINE_SUB_MAKEFUNC(note_sub)
+     
 DEFINE_ADDFUNC2(note_sub, source_citation, citation)
 DEFINE_ADDFUNC2(note_sub, user_data, extra)
      
@@ -123,6 +141,18 @@ void note_sub_subscribe()
   gedcom_subscribe_to_element(ELT_SUB_NOTE, sub_note_start, sub_note_end);
 }
 
+void UNREFALLFUNC(note_sub)(struct note_sub* obj)
+{
+  if (obj) {
+    struct note_sub* runner;
+    for (runner = obj; runner; runner = runner->next) {
+      unref_xref_value(runner->reference);
+      UNREFALLFUNC(source_citation)(runner->citation);
+      UNREFALLFUNC(user_data)(runner->extra);
+    }
+  }
+}
+
 void CLEANFUNC(note_sub)(struct note_sub* note)
 {
   if (note) {