Merge pull request #2475 from kyulee1/fixilasm

Fix assertion in ilasm

1 files changed, 4 insertions, 7 deletions

diff --git a/src/ilasm/assembler.cpp b/src/ilasm/assembler.cpp
index 275b721f36..2398ba92f6 100644
--- a/src/ilasm/assembler.cpp
+++ b/src/ilasm/assembler.cpp
@@ -2274,7 +2274,7 @@ void Assembler::EmitSecurityInfo(mdToken            token,
     mdTypeRef           tkTypeRef;
     BinStr             *pSig;
     char               *szMemberName;
-    DWORD               dwErrorIndex;
+    DWORD               dwErrorIndex = 0;
 
     if (pPermissions) {
 
@@ -2320,18 +2320,15 @@ void Assembler::EmitSecurityInfo(mdToken            token,
                                                        uCount,
                                                        &dwErrorIndex)))
             {
+                _ASSERT(uCount >= dwErrorIndex);
                 if (dwErrorIndex == uCount)
                 {
                     report->error("Failed to define security attribute set for 0x%08X\n", token);
                 }
                 else
                 {
-                    _ASSERT(uCount > dwErrorIndex);
-                    if (uCount > dwErrorIndex)
-                    {
-                        report->error("Failed to define security attribute set for 0x%08X\n  (error in permission %u)\n",
-                                      token, uCount - dwErrorIndex);
-                    }
+                    report->error("Failed to define security attribute set for 0x%08X\n  (error in permission %u)\n",
+                                  token, uCount - dwErrorIndex);
                 }
             }
             delete [] pAttrs;