Skip to content

Commit 7673598

Browse files
committed
Small bug fix
1 parent 2fb2fc9 commit 7673598

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

pyarchivefile.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4848,6 +4848,7 @@ def ReadFileDataWithContent(fp, filestart=0, listonly=False, uncompress=True, sk
48484848
CatSizeEnd = CatSize
48494849
fp.seek(curloc, 0)
48504850
inheaderver = str(int(formatspecs['format_ver'].replace(".", "")))
4851+
headeroffset = fp.tell()
48514852
formstring = fp.read(formatspecs['format_len'] + len(inheaderver)).decode("UTF-8")
48524853
formdelszie = len(formatspecs['format_delimiter'])
48534854
formdel = fp.read(formdelszie).decode("UTF-8")
@@ -4867,7 +4868,7 @@ def ReadFileDataWithContent(fp, filestart=0, listonly=False, uncompress=True, sk
48674868
newfcs = GetHeaderChecksum([formstring] + inheader[:-1], fprechecksumtype, True, formatspecs, saltkey)
48684869
if(not headercheck and not skipchecksum):
48694870
VerbosePrintOut(
4870-
"File Header Checksum Error with file at offset " + str(0))
4871+
"File Header Checksum Error with file at offset " + str(headeroffset))
48714872
VerbosePrintOut("'" + fprechecksum + "' != " +
48724873
"'" + newfcs + "'")
48734874
return False
@@ -4919,6 +4920,7 @@ def ReadFileDataWithContentToArray(fp, filestart=0, seekstart=0, seekend=0, list
49194920
CatSizeEnd = CatSize
49204921
fp.seek(curloc, 0)
49214922
inheaderver = str(int(formatspecs['format_ver'].replace(".", "")))
4923+
headeroffset = fp.tell()
49224924
formstring = fp.read(formatspecs['format_len'] + len(inheaderver)).decode("UTF-8")
49234925
formdelszie = len(formatspecs['format_delimiter'])
49244926
formdel = fp.read(formdelszie).decode("UTF-8")
@@ -5071,7 +5073,7 @@ def ReadFileDataWithContentToArray(fp, filestart=0, seekstart=0, seekend=0, list
50715073
newfcs = GetHeaderChecksum([formstring] + inheader[:-1], fprechecksumtype, True, formatspecs, saltkey)
50725074
if(not headercheck and not skipchecksum):
50735075
VerbosePrintOut(
5074-
"File Header Checksum Error with file at offset " + str(0))
5076+
"File Header Checksum Error with file at offset " + str(headeroffset))
50755077
VerbosePrintOut("'" + fprechecksum + "' != " +
50765078
"'" + newfcs + "'")
50775079
return False
@@ -5181,6 +5183,7 @@ def ReadFileDataWithContentToList(fp, filestart=0, seekstart=0, seekend=0, listo
51815183
CatSizeEnd = CatSize
51825184
fp.seek(curloc, 0)
51835185
inheaderver = str(int(formatspecs['format_ver'].replace(".", "")))
5186+
headeroffset = fp.tell()
51845187
formstring = fp.read(formatspecs['format_len'] + len(inheaderver)).decode("UTF-8")
51855188
formdelszie = len(formatspecs['format_delimiter'])
51865189
formdel = fp.read(formdelszie).decode("UTF-8")
@@ -5254,7 +5257,7 @@ def ReadFileDataWithContentToList(fp, filestart=0, seekstart=0, seekend=0, listo
52545257
newfcs = GetHeaderChecksum([formstring] + inheader[:-1], fprechecksumtype, True, formatspecs, saltkey)
52555258
if(not headercheck and not skipchecksum):
52565259
VerbosePrintOut(
5257-
"File Header Checksum Error with file at offset " + str(0))
5260+
"File Header Checksum Error with file at offset " + str(headeroffset))
52585261
VerbosePrintOut("'" + fprechecksum + "' != " +
52595262
"'" + newfcs + "'")
52605263
return False
@@ -9726,14 +9729,14 @@ def ArchiveFileValidate(infile, fmttype="auto", filestart=0, formatspecs=__file_
97269729
formatspecs = formatspecs[compresschecking]
97279730
fp.seek(filestart, 0)
97289731
inheaderver = str(int(formatspecs['format_ver'].replace(".", "")))
9732+
headeroffset = fp.tell()
97299733
formstring = fp.read(formatspecs['format_len'] + len(inheaderver)).decode("UTF-8")
97309734
formdelsize = len(formatspecs['format_delimiter'])
97319735
formdel = fp.read(formdelsize).decode("UTF-8")
97329736
if(formstring != formatspecs['format_magic'] + inheaderver):
97339737
return False
97349738
if(formdel != formatspecs['format_delimiter']):
97359739
return False
9736-
headeroffset = fp.tell()
97379740
if(__use_new_style__):
97389741
inheader = ReadFileHeaderDataBySize(fp, formatspecs['format_delimiter'])
97399742
else:

0 commit comments

Comments
 (0)