asn2eth.py:

Catch a TypeError that gets thrown if we don't use any conversion
specifiers during string formatting.

H.248:

Don't dereference a null pointer.  Fixes bug 626.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@16773 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 4 insertions, 1 deletions

diff --git a/tools/asn2eth.py b/tools/asn2eth.py
index 318855f292..530d5d0bf9 100755
--- a/tools/asn2eth.py
+++ b/tools/asn2eth.py
@@ -903,7 +903,10 @@ class EthCtx:
     elif self.conform.get_fn_body_presence(self.eth_type[tname]['ref'][0]):
       out = self.conform.get_fn_text(self.eth_type[tname]['ref'][0], 'FN_BODY')
     if pars:
-      out = out % pars
+      try:
+        out = out % pars
+      except (TypeError):
+        pass
     return out
 
   #--- eth_output_hf ----------------------------------------------------------