Commit3e14ab5

committed

git.Tree: Fixed critical issue when reading trees from binary data. The previous version was making assumptions that would only be true for old git repositories it sesms. The new version of the algorithm deals with this gracefully.

1 parent4375386 commit3e14ab5Copy full SHA for 3e14ab5

File tree

1 file changed

-8

lines changed

lib/git/objects
- tree.py

1 file changed

-8

lines changed

`‎lib/git/objects/tree.py`

Lines changed: 6 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ class Tree(base.IndexObject, diff.Diffable, utils.Traversable):`
`44`	`44`	`commit_id=016`
`45`	`45`	`blob_id=010`
`46`	`46`	`symlink_id=012`
`47`		`-tree_id=040`
	`47`	`+tree_id=004`
`48`	`48`
`49`	`49`
`50`	`50`	`def__init__(self,repo,sha,mode=0,path=None):`
`@@ -97,18 +97,17 @@ def _iter_from_data(self):`
`97`	`97`	`i=0`
`98`	`98`	`whilei<len_data:`
`99`	`99`	`mode=0`
`100`		`-mode_boundary=i+6`
`101`		`-`
`102`		`-# read type`
`103`		`-type_id= ((ord(data[i])-ord_zero)<<3)+ (ord(data[i+1])-ord_zero)`
`104`		`-i+=2`
`105`	`100`
	`101`	`+# read mode`
	`102`	`+# Some git versions truncate the leading 0, some don't`
	`103`	`+# The type will be extracted from the mode later`
`106`	`104`	`whiledata[i]!=' ':`
`107`	`105`	`# move existing mode integer up one level being 3 bits`
`108`	`106`	`# and add the actual ordinal value of the character`
`109`	`107`	`mode= (mode<<3)+ (ord(data[i])-ord_zero)`
`110`	`108`	`i+=1`
`111`	`109`	`# END while reading mode`
	`110`	`+type_id=mode>>12`
`112`	`111`
`113`	`112`	`# byte is space now, skip it`
`114`	`113`	`i+=1`
`@@ -127,7 +126,6 @@ def _iter_from_data(self):`
`127`	`126`	`sha=data[i:i+20]`
`128`	`127`	`i=i+20`
`129`	`128`
`130`		`-mode\|=type_id<<12`
`131`	`129`	`hexsha=sha_to_hex(sha)`
`132`	`130`	`iftype_id==self.blob_idortype_id==self.symlink_id:`
`133`	`131`	`yieldblob.Blob(self.repo,hexsha,mode,path)`
`@@ -137,7 +135,7 @@ def _iter_from_data(self):`
`137`	`135`	`# todo`
`138`	`136`	`yieldNone`
`139`	`137`	`else:`
`140`		`-raiseTypeError("Unknown type found in tree data: %i"%type_id)`
	`138`	`+raiseTypeError("Unknown type found in tree data %i for path '%s'"%(type_id,path))`
`141`	`139`	`# END for each byte in data stream`
`142`	`140`
`143`	`141`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit3e14ab5

File tree

1 file changed

1 file changed

`‎lib/git/objects/tree.py`

0 commit comments