X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_choice.c;h=8883b04080328eeb9a49aa2c8e4c5a24c6c11af2;hb=892f7f56860a1ee8e8d816eeaec0387c54c1a0a7;hp=086631142331c09236c3fe257bdfcebf3c92b43f;hpb=0dcf720d5b83783f6dba31f44b12513cefdd2f75;p=yaz-moved-to-github.git

diff --git a/odr/odr_choice.c b/odr/odr_choice.c
index 0866311..8883b04 100644
--- a/odr/odr_choice.c
+++ b/odr/odr_choice.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_choice.c,v $
- * Revision 1.1  1995-02-07 17:52:59  quinn
+ * 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
+ * Works better now.
+ *
+ * Revision 1.1  1995/02/07  17:52:59  quinn
  * A damn mess, but now things work, I think.
  *
  */
@@ -15,7 +24,9 @@ int odr_choice(ODR o, Odr_arm arm[], void *p, int *which)
 {
     int i, cl = -1, tg, cn;
 
-    if (o->direction != ODR_DECODE && !*(char*)p)
+    if (o->error)
+    	return 0;
+    if (o->direction != ODR_DECODE && !*(char**)p)
     	return 0;
     for (i = 0; arm[i].fun; i++)
     {
@@ -28,6 +39,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;
 	    }