osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Yannik Enss 2019-06-03 09:55:54 +02:00 committed by Gerald Combs
parent 54db60f4e5
commit 1c09af410d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/wireshark_gen.py
View File

@ -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 )