From a200fc19301615242b43e18b9c03027d495302bb Mon Sep 17 00:00:00 2001
From: Sebastian Hammer <quinn@indexdata.com>
Date: Mon, 19 Jun 1995 17:01:48 +0000
Subject: [PATCH] This should bring us in sync with the version distributed as
 1.0b

---
 asn/proto.c      |    7 +++++--
 odr/odr_choice.c |    7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/asn/proto.c b/asn/proto.c
index 73c369a..b745479 100644
--- a/asn/proto.c
+++ b/asn/proto.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: proto.c,v $
- * Revision 1.33  1995-06-19 13:39:56  quinn
+ * Revision 1.34  1995-06-19 17:01:48  quinn
+ * This should bring us in sync with the version distributed as 1.0b
+ *
+ * Revision 1.33  1995/06/19  13:39:56  quinn
  * *** empty log message ***
  *
  * Revision 1.32  1995/06/19  12:37:28  quinn
@@ -461,7 +464,7 @@ int z_ElementSetNames(ODR o, Z_ElementSetNames **p, int opt)
 
     if (o->direction == ODR_DECODE)
     	*p = odr_malloc(o, sizeof(**p));
-    else
+    else if (!*p)
     	return opt && odr_ok(o);
 
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
diff --git a/odr/odr_choice.c b/odr/odr_choice.c
index 9f5ef30..8727aac 100644
--- a/odr/odr_choice.c
+++ b/odr/odr_choice.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_choice.c,v $
- * Revision 1.7  1995-06-19 13:06:50  quinn
+ * Revision 1.8  1995-06-19 17:01:51  quinn
+ * This should bring us in sync with the version distributed as 1.0b
+ *
+ * Revision 1.7  1995/06/19  13:06:50  quinn
  * Fixed simple bug in the code to handle untagged choice elements.
  *
  * Revision 1.6  1995/05/16  08:50:53  quinn
@@ -74,7 +77,7 @@ int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp)
 	}
 	else  /* no tagging. Have to poll type */
 	{
-	    if ((*arm[i].fun)(o, p, 1) && *(char*)p)
+	    if ((*arm[i].fun)(o, p, 1) && *(char**)p)
 	    	return 1;
 	}
     }
-- 
1.7.10.4