handle nested descriptors properly

Author: grs

lib/types.js

@@ -614,19 +614,22 @@ types.Reader.prototype.read = function () {
     return constructor.descriptor ? types.described_nc(constructor.descriptor, value) : value;
 };
 
-types.Reader.prototype.read_constructor = function () {
+types.Reader.prototype.read_constructor = function (descriptors) {
     var code = this.read_typecode();
     if (code === 0x00) {
-        var d = [];
-        d.push(this.read());
-        var c = this.read_constructor();
-        while (c.descriptor) {
-            d.push(c.descriptor);
-            c = this.read_constructor();
+        if (descriptors === undefined) {
+            descriptors = [];
         }
-        return {'typecode': c.typecode, 'descriptor':  d.length === 1 ? d[0] : d};
+        descriptors.push(this.read());
+        return this.read_constructor(descriptors);
     } else {
-        return {'typecode': code};
+        if (descriptors === undefined) {
+            return {'typecode': code};
+        } else if (descriptors.length === 1) {
+            return {'typecode': code, 'descriptor':  descriptors[0]};
+        } else {
+            return {'typecode': code, 'descriptor':  descriptors[0], 'descriptors': descriptors};
+        }
     }
 };