Skip to content

Commit 01ed13e

Browse files
committed
Small bug fix
1 parent 3d9702f commit 01ed13e

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

pycatfile.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4854,6 +4854,7 @@ def ReadFileDataWithContent(fp, filestart=0, listonly=False, uncompress=True, sk
48544854
CatSizeEnd = CatSize
48554855
fp.seek(curloc, 0)
48564856
inheaderver = str(int(formatspecs['format_ver'].replace(".", "")))
4857+
headeroffset = fp.tell()
48574858
formstring = fp.read(formatspecs['format_len'] + len(inheaderver)).decode("UTF-8")
48584859
formdelszie = len(formatspecs['format_delimiter'])
48594860
formdel = fp.read(formdelszie).decode("UTF-8")
@@ -4873,7 +4874,7 @@ def ReadFileDataWithContent(fp, filestart=0, listonly=False, uncompress=True, sk
48734874
newfcs = GetHeaderChecksum([formstring] + inheader[:-1], fprechecksumtype, True, formatspecs, saltkey)
48744875
if(not headercheck and not skipchecksum):
48754876
VerbosePrintOut(
4876-
"File Header Checksum Error with file at offset " + str(0))
4877+
"File Header Checksum Error with file at offset " + str(headeroffset))
48774878
VerbosePrintOut("'" + fprechecksum + "' != " +
48784879
"'" + newfcs + "'")
48794880
return False
@@ -4925,6 +4926,7 @@ def ReadFileDataWithContentToArray(fp, filestart=0, seekstart=0, seekend=0, list
49254926
CatSizeEnd = CatSize
49264927
fp.seek(curloc, 0)
49274928
inheaderver = str(int(formatspecs['format_ver'].replace(".", "")))
4929+
headeroffset = fp.tell()
49284930
formstring = fp.read(formatspecs['format_len'] + len(inheaderver)).decode("UTF-8")
49294931
formdelszie = len(formatspecs['format_delimiter'])
49304932
formdel = fp.read(formdelszie).decode("UTF-8")
@@ -5077,7 +5079,7 @@ def ReadFileDataWithContentToArray(fp, filestart=0, seekstart=0, seekend=0, list
50775079
newfcs = GetHeaderChecksum([formstring] + inheader[:-1], fprechecksumtype, True, formatspecs, saltkey)
50785080
if(not headercheck and not skipchecksum):
50795081
VerbosePrintOut(
5080-
"File Header Checksum Error with file at offset " + str(0))
5082+
"File Header Checksum Error with file at offset " + str(headeroffset))
50815083
VerbosePrintOut("'" + fprechecksum + "' != " +
50825084
"'" + newfcs + "'")
50835085
return False
@@ -5187,6 +5189,7 @@ def ReadFileDataWithContentToList(fp, filestart=0, seekstart=0, seekend=0, listo
51875189
CatSizeEnd = CatSize
51885190
fp.seek(curloc, 0)
51895191
inheaderver = str(int(formatspecs['format_ver'].replace(".", "")))
5192+
headeroffset = fp.tell()
51905193
formstring = fp.read(formatspecs['format_len'] + len(inheaderver)).decode("UTF-8")
51915194
formdelszie = len(formatspecs['format_delimiter'])
51925195
formdel = fp.read(formdelszie).decode("UTF-8")
@@ -5260,7 +5263,7 @@ def ReadFileDataWithContentToList(fp, filestart=0, seekstart=0, seekend=0, listo
52605263
newfcs = GetHeaderChecksum([formstring] + inheader[:-1], fprechecksumtype, True, formatspecs, saltkey)
52615264
if(not headercheck and not skipchecksum):
52625265
VerbosePrintOut(
5263-
"File Header Checksum Error with file at offset " + str(0))
5266+
"File Header Checksum Error with file at offset " + str(headeroffset))
52645267
VerbosePrintOut("'" + fprechecksum + "' != " +
52655268
"'" + newfcs + "'")
52665269
return False
@@ -9732,14 +9735,14 @@ def CatFileValidate(infile, fmttype="auto", filestart=0, formatspecs=__file_form
97329735
formatspecs = formatspecs[compresschecking]
97339736
fp.seek(filestart, 0)
97349737
inheaderver = str(int(formatspecs['format_ver'].replace(".", "")))
9738+
headeroffset = fp.tell()
97359739
formstring = fp.read(formatspecs['format_len'] + len(inheaderver)).decode("UTF-8")
97369740
formdelsize = len(formatspecs['format_delimiter'])
97379741
formdel = fp.read(formdelsize).decode("UTF-8")
97389742
if(formstring != formatspecs['format_magic'] + inheaderver):
97399743
return False
97409744
if(formdel != formatspecs['format_delimiter']):
97419745
return False
9742-
headeroffset = fp.tell()
97439746
if(__use_new_style__):
97449747
inheader = ReadFileHeaderDataBySize(fp, formatspecs['format_delimiter'])
97459748
else:

0 commit comments

Comments
 (0)