Changeset 72367 in vbox for trunk/src

Timestamp:

May 28, 2018 6:05:58 PM (7 years ago)

Author:

vboxsync

Message:

Runtime: Updates bugref:9188

File:

• trunk/src/VBox/Runtime/common/asn1/asn1-ut-integer-decode.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/asn1/asn1-ut-integer-decode.cpp

@@ -49 +49 @@
         if (RT_SUCCESS(rc))
         {
-            uint32_t offLast = pThis->Asn1Core.cb - 1;
-            switch (pThis->Asn1Core.cb)
+            if (pThis->Asn1Core.cb > 0)
             {
-                default:
-                case 8: pThis->uValue.u |= (uint64_t)pThis->Asn1Core.uData.pu8[offLast - 7] << 56; RT_FALL_THRU();
-                case 7: pThis->uValue.u |= (uint64_t)pThis->Asn1Core.uData.pu8[offLast - 6] << 48; RT_FALL_THRU();
-                case 6: pThis->uValue.u |= (uint64_t)pThis->Asn1Core.uData.pu8[offLast - 5] << 40; RT_FALL_THRU();
-                case 5: pThis->uValue.u |= (uint64_t)pThis->Asn1Core.uData.pu8[offLast - 4] << 32; RT_FALL_THRU();
-                case 4: pThis->uValue.u |= (uint32_t)pThis->Asn1Core.uData.pu8[offLast - 3] << 24; RT_FALL_THRU();
-                case 3: pThis->uValue.u |= (uint32_t)pThis->Asn1Core.uData.pu8[offLast - 2] << 16; RT_FALL_THRU();
-                case 2: pThis->uValue.u |= (uint16_t)pThis->Asn1Core.uData.pu8[offLast - 1] <<  8; RT_FALL_THRU();
-                case 1: pThis->uValue.u |=           pThis->Asn1Core.uData.pu8[offLast];
+                uint32_t offLast = pThis->Asn1Core.cb - 1;
+                switch (pThis->Asn1Core.cb)
+                {
+                    default:
+                    case 8: pThis->uValue.u |= (uint64_t)pThis->Asn1Core.uData.pu8[offLast - 7] << 56; RT_FALL_THRU();
+                    case 7: pThis->uValue.u |= (uint64_t)pThis->Asn1Core.uData.pu8[offLast - 6] << 48; RT_FALL_THRU();
+                    case 6: pThis->uValue.u |= (uint64_t)pThis->Asn1Core.uData.pu8[offLast - 5] << 40; RT_FALL_THRU();
+                    case 5: pThis->uValue.u |= (uint64_t)pThis->Asn1Core.uData.pu8[offLast - 4] << 32; RT_FALL_THRU();
+                    case 4: pThis->uValue.u |= (uint32_t)pThis->Asn1Core.uData.pu8[offLast - 3] << 24; RT_FALL_THRU();
+                    case 3: pThis->uValue.u |= (uint32_t)pThis->Asn1Core.uData.pu8[offLast - 2] << 16; RT_FALL_THRU();
+                    case 2: pThis->uValue.u |= (uint16_t)pThis->Asn1Core.uData.pu8[offLast - 1] <<  8; RT_FALL_THRU();
+                    case 1: pThis->uValue.u |=           pThis->Asn1Core.uData.pu8[offLast];
+                }
+                RTAsn1CursorSkip(pCursor, pThis->Asn1Core.cb);
+                pThis->Asn1Core.fFlags |= RTASN1CORE_F_PRIMITE_TAG_STRUCT;
+                pThis->Asn1Core.pOps    = &g_RTAsn1Integer_Vtable;
+                return VINF_SUCCESS;
             }
-            RTAsn1CursorSkip(pCursor, pThis->Asn1Core.cb);
-            pThis->Asn1Core.fFlags |= RTASN1CORE_F_PRIMITE_TAG_STRUCT;
-            pThis->Asn1Core.pOps    = &g_RTAsn1Integer_Vtable;
-            return VINF_SUCCESS;
+            else
+                rc = RTAsn1CursorSetInfo(pCursor, VERR_ASN1_INVALID_INTEGER_ENCODING,
+                                         "%s: Invalid integer length, exepcted more than 0: %#x",
+                                         pszErrorTag, pThis->Asn1Core.cb);
         }
     }