Skip to content

Commit aa2baca

Browse files
committed
Small bug fix
1 parent 8781b8d commit aa2baca

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

pyfoxfile.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4855,6 +4855,7 @@ def ReadFileDataWithContent(fp, filestart=0, listonly=False, uncompress=True, sk
48554855
CatSizeEnd = CatSize
48564856
fp.seek(curloc, 0)
48574857
inheaderver = str(int(formatspecs['format_ver'].replace(".", "")))
4858+
headeroffset = fp.tell()
48584859
formstring = fp.read(formatspecs['format_len'] + len(inheaderver)).decode("UTF-8")
48594860
formdelszie = len(formatspecs['format_delimiter'])
48604861
formdel = fp.read(formdelszie).decode("UTF-8")
@@ -4874,7 +4875,7 @@ def ReadFileDataWithContent(fp, filestart=0, listonly=False, uncompress=True, sk
48744875
newfcs = GetHeaderChecksum([formstring] + inheader[:-1], fprechecksumtype, True, formatspecs, saltkey)
48754876
if(not headercheck and not skipchecksum):
48764877
VerbosePrintOut(
4877-
"File Header Checksum Error with file at offset " + str(0))
4878+
"File Header Checksum Error with file at offset " + str(headeroffset))
48784879
VerbosePrintOut("'" + fprechecksum + "' != " +
48794880
"'" + newfcs + "'")
48804881
return False
@@ -4926,6 +4927,7 @@ def ReadFileDataWithContentToArray(fp, filestart=0, seekstart=0, seekend=0, list
49264927
CatSizeEnd = CatSize
49274928
fp.seek(curloc, 0)
49284929
inheaderver = str(int(formatspecs['format_ver'].replace(".", "")))
4930+
headeroffset = fp.tell()
49294931
formstring = fp.read(formatspecs['format_len'] + len(inheaderver)).decode("UTF-8")
49304932
formdelszie = len(formatspecs['format_delimiter'])
49314933
formdel = fp.read(formdelszie).decode("UTF-8")
@@ -5078,7 +5080,7 @@ def ReadFileDataWithContentToArray(fp, filestart=0, seekstart=0, seekend=0, list
50785080
newfcs = GetHeaderChecksum([formstring] + inheader[:-1], fprechecksumtype, True, formatspecs, saltkey)
50795081
if(not headercheck and not skipchecksum):
50805082
VerbosePrintOut(
5081-
"File Header Checksum Error with file at offset " + str(0))
5083+
"File Header Checksum Error with file at offset " + str(headeroffset))
50825084
VerbosePrintOut("'" + fprechecksum + "' != " +
50835085
"'" + newfcs + "'")
50845086
return False
@@ -5188,6 +5190,7 @@ def ReadFileDataWithContentToList(fp, filestart=0, seekstart=0, seekend=0, listo
51885190
CatSizeEnd = CatSize
51895191
fp.seek(curloc, 0)
51905192
inheaderver = str(int(formatspecs['format_ver'].replace(".", "")))
5193+
headeroffset = fp.tell()
51915194
formstring = fp.read(formatspecs['format_len'] + len(inheaderver)).decode("UTF-8")
51925195
formdelszie = len(formatspecs['format_delimiter'])
51935196
formdel = fp.read(formdelszie).decode("UTF-8")
@@ -5261,7 +5264,7 @@ def ReadFileDataWithContentToList(fp, filestart=0, seekstart=0, seekend=0, listo
52615264
newfcs = GetHeaderChecksum([formstring] + inheader[:-1], fprechecksumtype, True, formatspecs, saltkey)
52625265
if(not headercheck and not skipchecksum):
52635266
VerbosePrintOut(
5264-
"File Header Checksum Error with file at offset " + str(0))
5267+
"File Header Checksum Error with file at offset " + str(headeroffset))
52655268
VerbosePrintOut("'" + fprechecksum + "' != " +
52665269
"'" + newfcs + "'")
52675270
return False
@@ -9733,14 +9736,14 @@ def FoxFileValidate(infile, fmttype="auto", filestart=0, formatspecs=__file_form
97339736
formatspecs = formatspecs[compresschecking]
97349737
fp.seek(filestart, 0)
97359738
inheaderver = str(int(formatspecs['format_ver'].replace(".", "")))
9739+
headeroffset = fp.tell()
97369740
formstring = fp.read(formatspecs['format_len'] + len(inheaderver)).decode("UTF-8")
97379741
formdelsize = len(formatspecs['format_delimiter'])
97389742
formdel = fp.read(formdelsize).decode("UTF-8")
97399743
if(formstring != formatspecs['format_magic'] + inheaderver):
97409744
return False
97419745
if(formdel != formatspecs['format_delimiter']):
97429746
return False
9743-
headeroffset = fp.tell()
97449747
if(__use_new_style__):
97459748
inheader = ReadFileHeaderDataBySize(fp, formatspecs['format_delimiter'])
97469749
else:

0 commit comments

Comments
 (0)