Commit8e1d4db

committed

fixed crash in ToArray when sequence explicitly denies __len__

1 parentd55a914 commit8e1d4dbCopy full SHA for 8e1d4db

File tree

-2

lines changed

-2

lines changed

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -761,6 +761,11 @@ private static bool ToArray(IntPtr value, Type obType, out object result, bool s`
`761`	`761`
`762`	`762`	`boolIsSeqObj=Runtime.PySequence_Check(value);`
`763`	`763`	`varlen=IsSeqObj?Runtime.PySequence_Size(value):-1;`
	`764`	`+if(IsSeqObj&&len<0)`
	`765`	`+{`
	`766`	`+// for the sequences, that explicitly deny calling __len__()`
	`767`	`+Exceptions.Clear();`
	`768`	`+}`
`764`	`769`
`765`	`770`	`varIterObject=Runtime.PyObject_GetIter(newBorrowedReference(value));`
`766`	`771`
`@@ -776,8 +781,9 @@ private static bool ToArray(IntPtr value, Type obType, out object result, bool s`
`776`	`781`
`777`	`782`	`varlistType=typeof(List<>);`
`778`	`783`	`varconstructedListType=listType.MakeGenericType(elementType);`
`779`		`-IListlist=IsSeqObj?(IList)Activator.CreateInstance(constructedListType,newObject[]{(int)len}):`
`780`		`-(IList)Activator.CreateInstance(constructedListType);`
	`784`	`+IListlist=IsSeqObj&&len>0`
	`785`	`+?(IList)Activator.CreateInstance(constructedListType,args:(int)len)`
	`786`	`+:(IList)Activator.CreateInstance(constructedListType);`
`781`	`787`	`NewReferenceitem;`
`782`	`788`
`783`	`789`	`while(!(item=Runtime.PyIter_Next(IterObject)).IsNull())`

Comments

(0)