[ViewVC] Diff of: cvs/Convert-BER-XS/XS.xs

Comparing Convert-BER-XS/XS.xs (file contents):
Revision 1.11 by root, Sat Apr 20 12:25:23 2019 UTC vs.
Revision 1.13 by root, Sat Apr 20 13:46:14 2019 UTC

 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
-// C99 required
+// C99 required!
+// this is not just for comments, but also for
+// integer constant semantics,
+// sscanf format modifiers and more.
 enum {
   // ASN_TAG
   ASN_BOOLEAN           = 0x01,
   ASN_INTEGER32         = 0x02,
   } *celem, default_map[] = {
       { ASN_UNIVERSAL, ASN_BOOLEAN          , BER_TYPE_BOOL },
       { ASN_UNIVERSAL, ASN_INTEGER32        , BER_TYPE_INT  },
       { ASN_UNIVERSAL, ASN_NULL             , BER_TYPE_NULL },
       { ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID  },
-      { ASN_UNIVERSAL, ASN_OBJECT_DESCRIPTOR, BER_TYPE_OID  },
       { ASN_UNIVERSAL, ASN_RELATIVE_OID     , BER_TYPE_RELOID },
       { ASN_UNIVERSAL, ASN_REAL             , BER_TYPE_REAL },
+      { ASN_UNIVERSAL, ASN_ENUMERATED       , BER_TYPE_INT },
       { ASN_UNIVERSAL, ASN_UTF8_STRING      , BER_TYPE_UTF8 },
       { ASN_UNIVERSAL, ASN_BMP_STRING       , BER_TYPE_UCS2 },
       { ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 },
   };
   // the one-digit case is absolutely predominant, so this pays off (hopefully)
   if (expect_true (u < 10))
     *buf++ = u + '0';
   else
     {
+      // this *could* be done much faster using branchless fixed-ppint arithmetics
       char *beg = buf;
       do
         {
           *buf++ = u % 10 + '0';
         }
       while (u);
       // reverse digits
       char *ptr = buf;
-      while (--ptr != beg)
+      while (--ptr > beg)
         {
           char c = *ptr;
           *ptr = *beg;
           *beg = c;
           ++beg;
     }
   U8 *end = cur + len;
   U32 w = get_w ();
-  static char oid[MAX_OID_STRLEN]; // must be static
+  static char oid[MAX_OID_STRLEN]; // static, becaueds too large for stack
   char *app = oid;
   if (relative)
     app = write_uv (app, w);
   else
       app = write_uv (app, (U8)w / 40);
       *app++ = '.';
       app = write_uv (app, (U8)w % 40);
     }
+  while (cur < end)
+    {
-  // we assume an oid component is never > 64 bytes
+      // we assume an oid component is never > 64 digits
-  while (cur < end && oid + sizeof (oid) - app > 64)
+      if (oid + sizeof (oid) - app < 64)
-    {
+        croak ("BER_TYPE_OID to long to decode");
       w = get_w ();
       *app++ = '.';
       app = write_uv (app, w);
     }
     }
   else
     switch (profile_lookup (cur_profile, klass, tag))
       {
         case BER_TYPE_NULL:
+          {
+            U32 len = get_length ();
+            if (len)
+              croak ("BER_TYPE_NULL value with non-zero length %d encountered", len);
-          res = &PL_sv_undef;
+            res = &PL_sv_undef;
+          }
           break;
         case BER_TYPE_BOOL:
           {
             U32 len = get_length ();
             if (len != 1)
-              croak ("BER_TYPE_BOOLEAN type with invalid length %d encountered", len);
+              croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered", len);
-            res = newSVcacheint (get_u8 () ? 0 : 1);
+            res = newSVcacheint (!!get_u8 ());
           }
           break;
         case BER_TYPE_OID:
           res = decode_oid (0);

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing Convert-BER-XS/XS.xs (file contents): Revision 1.11 by root, Sat Apr 20 12:25:23 2019 UTC vs. Revision 1.13 by root, Sat Apr 20 13:46:14 2019 UTC

Diff Legend

Comparing Convert-BER-XS/XS.xs (file contents):
Revision 1.11 by root, Sat Apr 20 12:25:23 2019 UTC vs.
Revision 1.13 by root, Sat Apr 20 13:46:14 2019 UTC