Fixed simple bug in the code to handle untagged choice elements.

diff --git a/odr/odr_choice.c b/odr/odr_choice.c
index 7bc6b28..9f5ef30 100644 (file)
--- 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.6  1995-05-16 08:50:53  quinn
+ * 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
  * License, documentation, and memory fixes
  *
  * Revision 1.5  1995/03/18  12:16:31  quinn
@@ -70,8 +73,10 @@ 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, 0))
+       {
+           if ((*arm[i].fun)(o, p, 1) && *(char*)p)
                return 1;
+       }
     }
     *which = -1;
     *(char*)p = 0;