vbox的更動 52536 路徑 trunk/src/VBox/Runtime/common/asn1/asn1-ut-objid.cpp

時間撮記:

2014-8-31 下午07:22:05 (11 年 以前)

作者:

vboxsync

svn:sync-xref-src-repo-rev:

95791

訊息:

RTAsn1ObjId_Compare: bugfix.

檔案:

• trunk/src/VBox/Runtime/common/asn1/asn1-ut-objid.cpp (修改) (1 筆差異)

trunk/src/VBox/Runtime/common/asn1/asn1-ut-objid.cpp

@@ -505 +505 @@
 RTDECL(int) RTAsn1ObjId_Compare(PCRTASN1OBJID pLeft, PCRTASN1OBJID pRight)
 {
-    if (!RTAsn1ObjId_IsPresent(pLeft) || RTAsn1ObjId_IsPresent(pRight))
-        return (int)RTAsn1ObjId_IsPresent(pLeft) - (int)RTAsn1ObjId_IsPresent(pRight);
-
-    uint8_t cComponents = RT_MIN(pLeft->cComponents, pRight->cComponents);
-    for (uint32_t i = 0; i < cComponents; i++)
-        if (pLeft->pauComponents[i] != pRight->pauComponents[i])
-            return pLeft->pauComponents[i] < pRight->pauComponents[i] ? -1 : 1;
-
-    if (pLeft->cComponents == pRight->cComponents)
-        return 0;
-    return pLeft->cComponents < pRight->cComponents ? -1 : 1;
+    if (RTAsn1ObjId_IsPresent(pLeft))
+    {
+        if (RTAsn1ObjId_IsPresent(pRight))
+        {
+            uint8_t cComponents = RT_MIN(pLeft->cComponents, pRight->cComponents);
+            for (uint32_t i = 0; i < cComponents; i++)
+                if (pLeft->pauComponents[i] != pRight->pauComponents[i])
+                    return pLeft->pauComponents[i] < pRight->pauComponents[i] ? -1 : 1;
+
+            if (pLeft->cComponents == pRight->cComponents)
+                return 0;
+            return pLeft->cComponents < pRight->cComponents ? -1 : 1;
+        }
+        return 1;
+    }
+    return 0 - (int)RTAsn1ObjId_IsPresent(pRight);
 }