Commita20eb7b

committed

[PGPRO-146] pgdata_content: checksum for truncated cfm

1 parent302db1c commita20eb7bCopy full SHA for a20eb7b

File tree

+12

-2

lines changed

+12

-2

lines changed

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1709,8 +1709,18 @@ def pgdata_content(self, pgdata, ignore_ptrack=True, exclude_dirs=None):`
`1709`	`1709`	`file_relpath=os.path.relpath(file_fullpath,pgdata)`
`1710`	`1710`	`directory_dict['files'][file_relpath]= {'is_datafile':False}`
`1711`	`1711`	`withopen(file_fullpath,'rb')asf:`
`1712`		`-directory_dict['files'][file_relpath]['md5']=hashlib.md5(f.read()).hexdigest()`
`1713`		`-f.close()`
	`1712`	`+content=f.read()`
	`1713`	`+# truncate cfm's content's zero tail`
	`1714`	`+iffile_relpath.endswith('.cfm'):`
	`1715`	`+zero64=b"\x00"*64`
	`1716`	`+l=len(content)`
	`1717`	`+whilel>64:`
	`1718`	`+s= (l-1)&~63`
	`1719`	`+ifcontent[s:l]!=zero64[:l-s]:`
	`1720`	`+break`
	`1721`	`+l=s`
	`1722`	`+content=content[:l]`
	`1723`	`+directory_dict['files'][file_relpath]['md5']=hashlib.md5(content).hexdigest()`
`1714`	`1724`	`# directory_dict['files'][file_relpath]['md5'] = hashlib.md5(`
`1715`	`1725`	`# f = open(file_fullpath, 'rb').read()).hexdigest()`
`1716`	`1726`

Comments

(0)