Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-11-18 20:43:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

PDB Input: Ignore malformed ExceptioNCharSets headers in plucker files. Fixes #2123829 [PDB to EPUB conversion Python error](https://bugs.launchpad.net/calibre/+bug/2123829)

Browse Source 
The data from the header was unused anyway
This commit is contained in:
Kovid Goyal 2025-09-15 17:10:59 +05:30
parent 5c1f96269d
commit d1ec4a2b91
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/calibre/ebooks/pdb/plucker/reader.py
View File

@ -189,7 +189,6 @@ class SectionMetadata:
def __init__(self, raw): def __init__(self, raw):
self.default_encoding = 'latin-1' self.default_encoding = 'latin-1'
self.exceptional_uid_encodings = {}
self.owner_id = None self.owner_id = None
record_count, = struct.unpack('>H', raw[0:2]) record_count, = struct.unpack('>H', raw[0:2])
@ -207,12 +206,7 @@ class SectionMetadata:
self.default_encoding = MIBNUM_TO_NAME.get(val, 'latin-1') self.default_encoding = MIBNUM_TO_NAME.get(val, 'latin-1')
# ExceptionalCharSets # ExceptionalCharSets
elif type == 2: elif type == 2:
ii_adv = 0 pass # not handled
for ii in range(length // 2):
uid, = struct.unpack('>H', raw[6+adv+ii_adv:8+adv+ii_adv])
mib, = struct.unpack('>H', raw[8+adv+ii_adv:10+adv+ii_adv])
self.exceptional_uid_encodings[uid] = MIBNUM_TO_NAME.get(mib, 'latin-1')
ii_adv += 4
# OwnerID # OwnerID
elif type == 3: elif type == 3:
self.owner_id = struct.unpack('>I', raw[6+adv:10+adv]) self.owner_id = struct.unpack('>I', raw[6+adv:10+adv])
@ -297,7 +291,6 @@ class Reader(FormatReader):
# list of sections. # list of sections.
self.uid_section_number = OrderedDict() self.uid_section_number = OrderedDict()
self.uid_text_secion_number = OrderedDict() self.uid_text_secion_number = OrderedDict()
self.uid_text_secion_encoding = {}
self.uid_image_section_number = {} self.uid_image_section_number = {}
self.uid_composite_image_section_number = {} self.uid_composite_image_section_number = {}
self.metadata_section_number = None self.metadata_section_number = None
@ -342,8 +335,6 @@ class Reader(FormatReader):
# to make access easier. # to make access easier.
if self.metadata_section_number: if self.metadata_section_number:
mdata_section = self.sections[self.metadata_section_number][1] mdata_section = self.sections[self.metadata_section_number][1]
for k, v in mdata_section.exceptional_uid_encodings.items():
self.uid_text_secion_encoding[k] = v
self.default_encoding = mdata_section.default_encoding self.default_encoding = mdata_section.default_encoding
self.owner_id = mdata_section.owner_id self.owner_id = mdata_section.owner_id