Merge aa042f2 into 23dfff7

kbandla · Jun 2, 2022 · 927f2a6 · 927f2a6
2 parents 23dfff7 + aa042f2
commit 927f2a6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/docs/authors.md b/docs/authors.md
@@ -73,4 +73,7 @@ Dug Song \<<dugsong@monkey.org>\>
   - crocogorical \<<crocogorical@gmail.com>\>  
     Extend test coverage
 
+  - Schwaggot \<<tom.ryan@posteo.de>\>  
+    Graceful handling of PCAPNG option comment UTF-8 decoding errors
+
 If you want to contribute to dpkt, see `contributing`.
diff --git a/dpkt/pcapng.py b/dpkt/pcapng.py
@@ -190,7 +190,13 @@ def unpack(self, buf):
 
         # decode comment
         if self.code == PCAPNG_OPT_COMMENT:
-            self.text = self.data.decode('utf-8')
+            try:
+                self.text = self.data.decode('utf-8')
+            except UnicodeDecodeError as ude:
+                if b'\x00' in self.data:
+                    self.text = self.data[:self.data.index(b'\x00')].decode('ascii')
+                else:
+                    raise ude
 
     def __bytes__(self):
         # encode comment