Fix infinite loop (bug introduced by previous commit)

[yaz-moved-to-github.git] / retrieval / d1_marc.c

diff --git a/retrieval/d1_marc.c b/retrieval/d1_marc.c
index e649b58..2252a8c 100644 (file)
--- a/retrieval/d1_marc.c
+++ b/retrieval/d1_marc.c
@@ -3,7 +3,7 @@
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Id: d1_marc.c,v 1.22 2002-08-17 07:56:59 adam Exp $
+ * $Id: d1_marc.c,v 1.26 2002-08-28 19:10:56 adam Exp $
  */
 
 
@@ -158,20 +158,24 @@ static char *get_data(data1_node *n, int *len)
     {
         if (n->which == DATA1N_data)
         {
+            int i;
             *len = n->u.data.len;
+
+            for (i = 0; i<*len; i++)
+                if (!d1_isspace(n->u.data.data[i]))
+                    break;
             while (*len && d1_isspace(n->u.data.data[*len - 1]))
                 (*len)--;
-            if (*len != 0)
-                return n->u.data.data;
+            *len = *len - i;
+            if (*len > 0)
+                return n->u.data.data + i;
         }
         if (n->which == DATA1N_tag)
-            np = n->child;
-        n = n->next;
-        if (!n)
-        {
-            n = np;
-            np = 0;
-        }
+            n = n->child;
+       else if (n->which == DATA1N_data)
+            n = n->next;
+       else
+            break;     
     }
     r = "";
     *len = strlen(r);
@@ -228,11 +232,15 @@ static int nodetomarc(data1_handle dh,
        }
        if (selected && !field->u.tag.node_selected)
            continue;
+
+       subf = field->child;
+        if (!subf)
+            continue;
+
         len += 4 + p->length_data_entry + p->length_starting
             + p->length_implementation;
         base_address += 3 + p->length_data_entry + p->length_starting
             + p->length_implementation;
-       subf = field->child;
 
        if (subf->which == DATA1N_data)
             is00X = 1;
@@ -289,6 +297,8 @@ static int nodetomarc(data1_handle dh,
            continue;
 
        subf = field->child;
+        if (!subf)
+            continue;
 
         if (subf->which == DATA1N_data)
             is00X = 1;