From 214455c7382c4867df4f6cd8cb23b59602192e6d Mon Sep 17 00:00:00 2001 From: Sebastian Hammer Date: Thu, 5 Dec 1996 13:17:47 +0000 Subject: [PATCH 1/1] Fixed GRS-1 null-ref --- CHANGELOG | 4 ++-- retrieval/d1_grs.c | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index e34f2d9..0a4556b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,13 +1,13 @@ Possible compatibility problems with earlier versions marked with '*'. +Fixed null-reference problem in GRS-1 output filter. + Proximity operator added to Prefix Query Format (PQF). In test client command "base" accepts multiple databases. Fixed bug in cs_close stack that caused trouble with WINSOCK. ---- 1.3 1996/10/11 - Fixed tagging bug in ResourceReportResponse PDU encoder/decode. Smallish bug-fixes in the new encoders/decoders (explain). diff --git a/retrieval/d1_grs.c b/retrieval/d1_grs.c index a819d21..8f0b66e 100644 --- a/retrieval/d1_grs.c +++ b/retrieval/d1_grs.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: d1_grs.c,v $ - * Revision 1.7 1996-10-11 11:57:23 quinn + * Revision 1.8 1996-12-05 13:17:49 quinn + * Fixed GRS-1 null-ref + * + * Revision 1.7 1996/10/11 11:57:23 quinn * Smallish * * Revision 1.6 1996/07/06 19:58:34 quinn @@ -143,10 +146,6 @@ static Z_ElementData *nodetoelementdata(data1_node *n, int select, int leaf, ODR o, int *len) { Z_ElementData *res = odr_malloc(o, sizeof(*res)); - data1_node *p; - - for (p = n->parent; p && p->which != DATA1N_tag; p = p->parent) - ; if (!n) { @@ -157,6 +156,10 @@ static Z_ElementData *nodetoelementdata(data1_node *n, int select, int leaf, { char str[512]; int toget; + data1_node *p; + + for (p = n->parent; p && p->which != DATA1N_tag; p = p->parent) + ; switch (n->u.data.what) { -- 1.7.10.4