No crash on note with zero length name (#592)

* No crash on note with zero length name * Comment placement
eliben · Jan 14, 2025 · a916fe5 · a916fe5
1 parent 12034a5
commit a916fe5
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/elftools/elf/notes.py b/elftools/elf/notes.py
@@ -25,11 +25,14 @@ def iter_notes(elffile, offset, size):
         note['n_offset'] = offset
         offset += nhdr_size
         elffile.stream.seek(offset)
-        # n_namesz is 4-byte aligned.
-        disk_namesz = roundup(note['n_namesz'], 2)
-        note['n_name'] = bytes2str(
-            CString('').parse(elffile.stream.read(disk_namesz)))
-        offset += disk_namesz
+        if note['n_namesz']:
+            # n_namesz is 4-byte aligned.
+            disk_namesz = roundup(note['n_namesz'], 2)
+            note['n_name'] = bytes2str(
+                CString('').parse(elffile.stream.read(disk_namesz)))
+            offset += disk_namesz
+        else:
+            note['n_name'] = None
 
         desc_data = elffile.stream.read(note['n_descsz'])
         note['n_descdata'] = desc_data