Fixed a crash when instantiating template types

L3n41c · Jul 1, 2013 · be558b8 · be558b8
1 parent 082b4d0
commit be558b8
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 19 deletions.
diff --git a/INSTALL b/INSTALL
@@ -9,8 +9,8 @@ All rights reserved.
 RELEASE INFORMATION
 
 Project:           ABI Compliance Checker (ACC)
-Version:           1.99.6
-Date:              2013-06-29
+Version:           1.99.7
+Date:              2013-07-01
 
 
 This file explains how to install and setup environment

diff --git a/abi-compliance-checker.pl b/abi-compliance-checker.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 ###########################################################################
-# ABI Compliance Checker (ACC) 1.99.6
+# ABI Compliance Checker (ACC) 1.99.7
 # A tool for checking backward compatibility of a C/C++ library API
 #
 # Copyright (C) 2009-2010 The Linux Foundation
@@ -64,7 +64,7 @@
 use Data::Dumper;
 use Config;
 
-my $TOOL_VERSION = "1.99.6";
+my $TOOL_VERSION = "1.99.7";
 my $ABI_DUMP_VERSION = "3.2";
 my $OLDEST_SUPPORTED_VERSION = "1.18";
 my $XML_REPORT_VERSION = "1.1";
@@ -2563,6 +2563,10 @@ ($$)
 sub instType($$$)
 { # create template instances
     my ($Map, $Tid, $LibVersion) = @_;
+
+    if(not $TypeInfo{$LibVersion}{$Tid}) {
+        return undef;
+    }
     my $Attr = dclone($TypeInfo{$LibVersion}{$Tid});
 
     foreach my $Key (sort keys(%{$Map}))
@@ -2657,8 +2661,11 @@ ($$$)
 
         if(defined $TypeInfo{$LibVersion}{$New}{"Memb"})
         {
-            foreach (sort {int($a)<=>int($b)} keys(%{$TypeInfo{$LibVersion}{$New}{"Memb"}})) {
-                $TypeInfo{$LibVersion}{$New}{"Memb"}{$_}{"type"} = instType(\%EMap, $TypeInfo{$LibVersion}{$New}{"Memb"}{$_}{"type"}, $LibVersion);
+            foreach (sort {int($a)<=>int($b)} keys(%{$TypeInfo{$LibVersion}{$New}{"Memb"}}))
+            {
+                if(defined $TypeInfo{$LibVersion}{$New}{"Memb"}{$_}{"type"}) {
+                    $TypeInfo{$LibVersion}{$New}{"Memb"}{$_}{"type"} = instType(\%EMap, $TypeInfo{$LibVersion}{$New}{"Memb"}{$_}{"type"}, $LibVersion);
+                }
             }
         }
 

diff --git a/doc/Changes.html b/doc/Changes.html
@@ -21,7 +21,7 @@
 </style>
 <script src="/load.php?debug=false&amp;lang=en&amp;modules=startup&amp;only=scripts&amp;skin=monobook&amp;*"></script>
 <script>if(window.mw){
-	mw.config.set({"wgCanonicalNamespace": "", "wgCanonicalSpecialPageName": false, "wgNamespaceNumber": 0, "wgPageName": "ABI_compliance_checker_Downloads", "wgTitle": "ABI Compliance Checker Downloads", "wgCurRevisionId": 8299, "wgArticleId": 2293, "wgIsArticle": true, "wgAction": "view", "wgUserName": null, "wgUserGroups": ["*"], "wgCategories": ["ABI Compliance Checker"], "wgBreakFrames": false, "wgRestrictionEdit": [], "wgRestrictionMove": []});
+	mw.config.set({"wgCanonicalNamespace": "", "wgCanonicalSpecialPageName": false, "wgNamespaceNumber": 0, "wgPageName": "ABI_compliance_checker_Downloads", "wgTitle": "ABI Compliance Checker Downloads", "wgCurRevisionId": 8301, "wgArticleId": 2293, "wgIsArticle": true, "wgAction": "view", "wgUserName": null, "wgUserGroups": ["*"], "wgCategories": ["ABI Compliance Checker"], "wgBreakFrames": false, "wgRestrictionEdit": [], "wgRestrictionMove": []});
 }
 </script><script>if(window.mw){
 	mw.loader.load(["mediawiki.page.startup"]);
@@ -43,7 +43,7 @@ <h1 id="firstHeading" class="firstHeading">ABI Compliance Checker - Change Log</
 </p>
 <table id="toc" class="toc"><tr><td><div id="toctitle"><h2>Contents</h2></div>
 <ul>
-<li class="toclevel-1 tocsection-1"><a href="#Version_1.99.6_.28June_29.2C_2013.29"><span class="tocnumber">1</span> <span class="toctext">Version 1.99.6 (June 29, 2013)</span></a></li>
+<li class="toclevel-1 tocsection-1"><a href="#Version_1.99.7_.28July_01.2C_2013.29"><span class="tocnumber">1</span> <span class="toctext">Version 1.99.7 (July 01, 2013)</span></a></li>
 <li class="toclevel-1 tocsection-2"><a href="#Version_1.99.1_.28June_07.2C_2013.29"><span class="tocnumber">2</span> <span class="toctext">Version 1.99.1 (June 07, 2013)</span></a></li>
 <li class="toclevel-1 tocsection-3"><a href="#Version_1.99_.28May_24.2C_2013.29"><span class="tocnumber">3</span> <span class="toctext">Version 1.99 (May 24, 2013)</span></a></li>
 <li class="toclevel-1 tocsection-4"><a href="#Version_1.98.8_.28February_07.2C_2013.29"><span class="tocnumber">4</span> <span class="toctext">Version 1.98.8 (February 07, 2013)</span></a></li>
@@ -91,8 +91,8 @@ <h1 id="firstHeading" class="firstHeading">ABI Compliance Checker - Change Log</
 <li class="toclevel-1 tocsection-46"><a href="#Version_1.0_.28July_31.2C_2009.29"><span class="tocnumber">46</span> <span class="toctext">Version 1.0 (July 31, 2009)</span></a></li>
 </ul>
 </td></tr></table>
-<h2> <span class="mw-headline" id="Version_1.99.6_.28June_29.2C_2013.29"> Version 1.99.6 (June 29, 2013) </span></h2>
-<p><a rel="nofollow" class="external text" href="https://github.com/lvc/abi-compliance-checker/archive/1.99.5.tar.gz">abi-compliance-checker-1.99.6.tar.gz</a><br />
+<h2> <span class="mw-headline" id="Version_1.99.7_.28July_01.2C_2013.29"> Version 1.99.7 (July 01, 2013) </span></h2>
+<p><a rel="nofollow" class="external text" href="https://github.com/lvc/abi-compliance-checker/archive/1.99.7.tar.gz">abi-compliance-checker-1.99.7.tar.gz</a><br />
 </p><p><b>ACC 2.0</b> pre-release.
 </p><p>This is a bug-fix release with a few new features.
 </p>
@@ -1037,5 +1037,5 @@ <h2> <span class="mw-headline" id="Version_1.0_.28July_31.2C_2009.29"> Version 1
 Expensive parser function count: 0/100
 -->
 
-<!-- Saved in parser cache with key rasispdb:pcache:idhash:2293-0!*!0!!en!*!* and timestamp 20130628133914 -->
+<!-- Saved in parser cache with key rasispdb:pcache:idhash:2293-0!*!0!!en!*!* and timestamp 20130701072418 -->
 </div></div></div></div></div></body></html>
diff --git a/doc/Descriptor.html b/doc/Descriptor.html
@@ -510,5 +510,5 @@ <h2> <span class="mw-headline" id="Examples"> Examples </span></h2>
 Expensive parser function count: 0/100
 -->
 
-<!-- Saved in parser cache with key rasispdb:pcache:idhash:2415-0!*!*!!en!*!* and timestamp 20130627211302 -->
+<!-- Saved in parser cache with key rasispdb:pcache:idhash:2415-0!*!*!!en!*!* and timestamp 20130630094106 -->
 </div></div></div></div></div></body></html>
diff --git a/doc/Options.html b/doc/Options.html
@@ -277,5 +277,5 @@ <h2> <span class="mw-headline" id="Other_Options"> Other Options </span></h2>
 Expensive parser function count: 0/100
 -->
 
-<!-- Saved in parser cache with key rasispdb:pcache:idhash:2442-0!*!0!!en!*!* and timestamp 20130628084703 -->
+<!-- Saved in parser cache with key rasispdb:pcache:idhash:2442-0!*!0!!en!*!* and timestamp 20130630174627 -->
 </div></div></div></div></div></body></html>
diff --git a/doc/Readme.html b/doc/Readme.html
@@ -21,7 +21,7 @@
 </style>
 <script src="/load.php?debug=false&amp;lang=en&amp;modules=startup&amp;only=scripts&amp;skin=monobook&amp;*"></script>
 <script>if(window.mw){
-	mw.config.set({"wgCanonicalNamespace": "", "wgCanonicalSpecialPageName": false, "wgNamespaceNumber": 0, "wgPageName": "ABI_compliance_checker", "wgTitle": "ABI Compliance Checker", "wgCurRevisionId": 8298, "wgArticleId": 2292, "wgIsArticle": true, "wgAction": "view", "wgUserName": null, "wgUserGroups": ["*"], "wgCategories": ["ABI Compliance Checker"], "wgBreakFrames": false, "wgRestrictionEdit": [], "wgRestrictionMove": []});
+	mw.config.set({"wgCanonicalNamespace": "", "wgCanonicalSpecialPageName": false, "wgNamespaceNumber": 0, "wgPageName": "ABI_compliance_checker", "wgTitle": "ABI Compliance Checker", "wgCurRevisionId": 8302, "wgArticleId": 2292, "wgIsArticle": true, "wgAction": "view", "wgUserName": null, "wgUserGroups": ["*"], "wgCategories": ["ABI Compliance Checker"], "wgBreakFrames": false, "wgRestrictionEdit": [], "wgRestrictionMove": []});
 }
 </script><script>if(window.mw){
 	mw.loader.load(["mediawiki.page.startup"]);
@@ -93,7 +93,7 @@ <h1 id="firstHeading" class="firstHeading">ABI Compliance Checker</h1>
 <h2> <span class="mw-headline" id="Downloads"> Downloads </span></h2>
 <h3> <span class="mw-headline" id="Releases"> Releases </span></h3>
 <p>All releases can be downloaded from <b><a href="Changes.html" title="ABI Compliance Checker Downloads">this page</a></b> or <b><a rel="nofollow" class="external text" href="https://github.com/lvc/abi-compliance-checker/">github.com</a></b>.
-</p><p>Latest release: <a rel="nofollow" class="external text" href="https://github.com/lvc/abi-compliance-checker/archive/1.99.6.tar.gz">1.99.6</a>
+</p><p>Latest release: <a rel="nofollow" class="external text" href="https://github.com/lvc/abi-compliance-checker/archive/1.99.7.tar.gz">1.99.7</a>
 </p>
 <h3> <span class="mw-headline" id="Git"> Git </span></h3>
 <p>Read-only access to the latest development version:<br />
@@ -499,5 +499,5 @@ <h2> <span class="mw-headline" id="Articles"> Articles </span></h2>
 Expensive parser function count: 0/100
 -->
 
-<!-- Saved in parser cache with key rasispdb:pcache:idhash:2292-0!*!0!!en!*!* and timestamp 20130628133842 -->
+<!-- Saved in parser cache with key rasispdb:pcache:idhash:2292-0!*!0!!en!*!* and timestamp 20130701072437 -->
 </div></div></div></div></div></body></html>
diff --git a/doc/SysCheck/Descriptor.html b/doc/SysCheck/Descriptor.html
@@ -233,5 +233,5 @@ <h2> <span class="mw-headline" id="Examples"> Examples </span></h2>
 Expensive parser function count: 0/100
 -->
 
-<!-- Saved in parser cache with key rasispdb:pcache:idhash:2657-0!*!*!!*!*!* and timestamp 20130628084706 -->
+<!-- Saved in parser cache with key rasispdb:pcache:idhash:2657-0!*!*!!*!*!* and timestamp 20130630123950 -->
 </div></div></div></div></div></body></html>
diff --git a/doc/SysCheck/Examples.html b/doc/SysCheck/Examples.html
@@ -239,5 +239,5 @@ <h3> <span class="mw-headline" id="Compare_ABI_Dumps_3"> Compare ABI Dumps </spa
 Expensive parser function count: 0/100
 -->
 
-<!-- Saved in parser cache with key rasispdb:pcache:idhash:2656-0!*!*!!en!*!* and timestamp 20130628032307 -->
+<!-- Saved in parser cache with key rasispdb:pcache:idhash:2656-0!*!*!!en!*!* and timestamp 20130630095600 -->
 </div></div></div></div></div></body></html>
diff --git a/doc/SysCheck/Usage.html b/doc/SysCheck/Usage.html
@@ -116,5 +116,5 @@ <h2> <span class="mw-headline" id="Examples"> Examples </span></h2>
 Expensive parser function count: 0/100
 -->
 
-<!-- Saved in parser cache with key rasispdb:pcache:idhash:2655-0!*!0!!en!*!* and timestamp 20130627150848 -->
+<!-- Saved in parser cache with key rasispdb:pcache:idhash:2655-0!*!0!!en!*!* and timestamp 20130630174636 -->
 </div></div></div></div></div></body></html>