Commit7f273fc

authored

Merge pull request#28852 from charris/backport-28804

BUG: fix heap buffer overflow in np.strings.find

2 parents1bc2e36 +ee2a49c commit7f273fcCopy full SHA for 7f273fc

File tree

-10

lines changed

-10

lines changed

Lines changed: 2 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -670,16 +670,8 @@ preprocess(CheckedIndexer<char_type> needle, Py_ssize_t len_needle,`
`670`	`670`	`assert(p->period + p->cut <= len_needle);`
`671`	`671`
`672`	`672`	`// Compare parts of the needle to check for periodicity.`
`673`		`-int cmp;`
`674`		`-if (std::is_same<char_type, npy_ucs4>::value) {`
`675`		`- cmp =memcmp(needle.buffer,`
`676`		`- needle.buffer + (p->period *sizeof(npy_ucs4)),`
`677`		`- (size_t) p->cut);`
`678`		`- }`
`679`		`-else {`
`680`		`- cmp =memcmp(needle.buffer, needle.buffer + p->period,`
`681`		`- (size_t) p->cut);`
`682`		`- }`
	`673`	`+int cmp =memcmp(needle.buffer, needle.buffer + p->period,`
	`674`	`+ (size_t) p->cut);`
`683`	`675`	`p->is_periodic = (0 == cmp);`
`684`	`676`
`685`	`677`	`// If periodic, gap is unused; otherwise, calculate period and gap.`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -381,6 +381,8 @@ def test_str_len(self, in_, out, dt):`
`381`	`381`	`None, [3,-1]),`
`382`	`382`	`("Ae¢☃€ 😊"*2,"😊",0,None,6),`
`383`	`383`	`("Ae¢☃€ 😊"*2,"😊",7,None,13),`
	`384`	`+pytest.param("A"* (2**17),r"[\w]+\Z",0,None,-1,`
	`385`	`+id=r"A2*17-[\w]+\Z-0-None--1"),`
`384`	`386`	`])`
`385`	`387`	`deftest_find(self,a,sub,start,end,out,dt):`
`386`	`388`	`if"😊"inaanddt=="S":`

Comments

(0)