X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=asn%2Fprt-acc.c;h=f3b860024619fcf8079c3292c0d752f4ef8042c6;hb=a571156582fe34154568c7b42f142e56879557d3;hp=93ca15272f00a14e0600805bc759542e84c82623;hpb=6edc916a5a8d44e1d7708f5018828e0d2020690b;p=yaz-moved-to-github.git

diff --git a/asn/prt-acc.c b/asn/prt-acc.c
index 93ca152..f3b8600 100644
--- a/asn/prt-acc.c
+++ b/asn/prt-acc.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: prt-acc.c,v $
- * Revision 1.1  1995-06-02 09:49:15  quinn
+ * Revision 1.5  1995-09-29 17:11:53  quinn
+ * Smallish
+ *
+ * Revision 1.4  1995/09/27  15:02:41  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.3  1995/08/15  11:59:41  quinn
+ * Updated External
+ *
+ * Revision 1.2  1995/06/05  10:52:05  quinn
+ * Fixed some negligences.
+ *
+ * Revision 1.1  1995/06/02  09:49:15  quinn
  * Adding access control
  *
  *
@@ -48,6 +60,8 @@ int z_PromptId1(ODR o, Z_PromptId1 **p, int opt)
 
     if (o->direction == ODR_DECODE)
     	*p = odr_malloc(o, sizeof(**p));
+    else if (!*p)
+    	return opt;
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
     	return 1;
     *p = 0;
@@ -67,6 +81,8 @@ int z_PromptInfo1(ODR o, Z_PromptInfo1 **p, int opt)
 
     if (o->direction == ODR_DECODE)
     	*p = odr_malloc(o, sizeof(**p));
+    else if (!*p)
+    	return opt;
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
     	return 1;
     *p = 0;
@@ -89,6 +105,7 @@ int z_ChallengeUnit1(ODR o, Z_ChallengeUnit1 **p, int opt)
 	    &(*p)->num_values) || odr_ok(o)) &&
 	odr_implicit(o, odr_null, &(*p)->shouldSave, ODR_CONTEXT, 7, 1) &&
 	odr_implicit(o, odr_integer, &(*p)->dataType, ODR_CONTEXT, 8, 1) &&
+	odr_implicit(o, z_External, &(*p)->diagnostic, ODR_CONTEXT, 9, 1) &&
 	odr_sequence_end(o);
 }
 
@@ -96,6 +113,8 @@ int z_Challenge1(ODR o, Z_Challenge1 **p, int opt)
 {
     if (o->direction == ODR_ENCODE)
     	*p = odr_malloc(o, sizeof(**p));
+    else if (!*p)
+    	return opt;
     if (odr_sequence_of(o, z_ChallengeUnit1, &(*p)->list,
 	&(*p)->num_challenges))
 	return 1;
@@ -131,6 +150,8 @@ int z_Response1(ODR o, Z_Response1 **p, int opt)
 {
     if (o->direction == ODR_ENCODE)
     	*p = odr_malloc(o, sizeof(**p));
+    else if (!*p)
+    	return opt;
     if (odr_sequence_of(o, z_ResponseUnit1, &(*p)->list,
 	&(*p)->num_responses))
 	return 1;
@@ -149,6 +170,8 @@ int z_PromptObject1(ODR o, Z_PromptObject1 **p, int opt)
 
     if (o->direction == ODR_DECODE)
     	*p = odr_malloc(o, sizeof(**p));
+    else if (!*p)
+    	return opt;
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
     	return 1;
     *p = 0;