diff options
author | Yannik Enss <Yannik.Enss@rohde-schwarz.com> | 2019-06-03 09:55:54 +0200 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2019-06-05 16:48:45 +0000 |
commit | 1c09af410db664a46fcd1158cb4f669df302ce6b (patch) | |
tree | 2ad81147c44c953f52f37a56d78b1e50fb933113 | |
parent | 54db60f4e5d3827fad600bad1cace34249047700 (diff) |
idl2wrs: fix recursion loop
wireshark_gen goes into an infinite recursion if it encounters a multi-level
alias, this is prevented
Change-Id: Icec678fb326b7c14344dc6df51015dad980587a9
Reviewed-on: https://code.wireshark.org/review/33458
Reviewed-by: Gerald Combs <gerald@wireshark.org>
-rwxr-xr-x | tools/wireshark_gen.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/wireshark_gen.py b/tools/wireshark_gen.py index 324238bafd..cc970b3631 100755 --- a/tools/wireshark_gen.py +++ b/tools/wireshark_gen.py @@ -1512,7 +1512,8 @@ class wireshark_gen_C: print "XXX get_CDR_alias_hf, type = " ,type , " pn = " , pn print "XXX get_CDR_alias_hf, type.decl() = " ,type.decl() - self.getCDR_hf(type, desc, filter, decl.identifier() ) + #self.getCDR_hf(type.unalias(), desc, filter, decl.identifier() ) + self.getCDR_hf(type.unalias(), desc, filter, pn ) # @@ -1714,7 +1715,7 @@ class wireshark_gen_C: else: # a simple typdef - self.getCDR(type, pn ) + self.getCDR(type.unalias(), pn ) |