X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_choice.c;h=7bc6b283081c9a04538279c5622be6e448540f3b;hb=fd5d2db3eb371d4af60e2d50d1c7e6fb2d4e64c3;hp=8faf925dec8595cc9c87ac1a39c98fd643d108b8;hpb=41f4b2c49b60cf5f9ae896b537211ae830c39a55;p=yaz-moved-to-github.git

diff --git a/odr/odr_choice.c b/odr/odr_choice.c
index 8faf925..7bc6b28 100644
--- a/odr/odr_choice.c
+++ b/odr/odr_choice.c
@@ -1,10 +1,19 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_choice.c,v $
- * Revision 1.3  1995-03-08 12:12:22  quinn
+ * Revision 1.6  1995-05-16 08:50:53  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.5  1995/03/18  12:16:31  quinn
+ * Minor changes.
+ *
+ * Revision 1.4  1995/03/14  16:59:38  quinn
+ * Added odr_constructed_more check
+ *
+ * Revision 1.3  1995/03/08  12:12:22  quinn
  * Added better error checking.
  *
  * Revision 1.2  1995/02/09  15:51:48  quinn
@@ -17,9 +26,9 @@
 
 #include <odr.h>
 
-int odr_choice(ODR o, Odr_arm arm[], void *p, int *which)
+int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp)
 {
-    int i, cl = -1, tg, cn;
+    int i, cl = -1, tg, cn, *which = whichp;
 
     if (o->error)
     	return 0;
@@ -36,6 +45,8 @@ int odr_choice(ODR o, Odr_arm arm[], void *p, int *which)
     	{
 	    if (o->direction == ODR_DECODE && cl < 0)
 	    {
+	    	if (o->stackp > -1 && !odr_constructed_more(o))
+		    return 0;
 	    	if (ber_dectag(o->bp, &cl, &tg, &cn) <= 0)
 		    return 0;
 	    }