NotificationsYou must be signed in to change notification settings
Fork10.9k
Star29.5k

Commitd171d09

committed

MNT: alternative handling of trailing null character

Trying to avoid this compiler warning: ../numpy/_core/src/multiarray/stringdtype/casts.cpp:860:12: warning: 'char* strncat(char*, const char*, size_t)' specified bound 15 equals source length [-Wstringop-overflow=] 860 | strncat(buf, suffix, slen); | ~~~~~~~^~~~~~~~~~~~~~~~~~~

1 parent60fccd5 commitd171d09Copy full SHA for d171d09

File tree

1 file changed

+10

-7

lines changed

numpy/_core/src/multiarray/stringdtype
- casts.cpp

1 file changed

+10

-7

lines changed

`‎numpy/_core/src/multiarray/stringdtype/casts.cpp`

Lines changed: 10 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -833,10 +833,11 @@ make_s2type_name(NPY_TYPES typenum) {`
`833`	`833`	`returnNULL;`
`834`	`834`	`}`
`835`	`835`
`836`		`-// memcpy instead of strcpy to avoid stringop-truncation warning, since`
`837`		`-// we are not including the trailing null character`
	`836`	`+// memcpy instead of strcpy/strncat to avoid stringop-truncation warning,`
	`837`	`+//sincewe are not including the trailing null character`
`838`	`838`	`memcpy(buf, prefix, plen);`
`839`		`-strncat(buf, type_name, nlen);`
	`839`	`+ buf += plen;`
	`840`	`+memcpy(buf, type_name, nlen);`
`840`	`841`	`return buf;`
`841`	`842`	`}`
`842`	`843`
`@@ -853,11 +854,13 @@ make_type2s_name(NPY_TYPES typenum) {`
`853`	`854`
`854`	`855`	`char buf = (char )PyMem_RawCalloc(sizeof(char), plen + nlen + slen +1);`
`855`	`856`
`856`		`-// memcpy instead of strcpy to avoid stringop-truncation warning, since`
`857`		`-// we are not including the trailing null character`
	`857`	`+// memcpy instead of strcpy/strncat to avoid stringop-truncation warning,`
	`858`	`+//sincewe are not including the trailing null character`
`858`	`859`	`memcpy(buf, prefix, plen);`
`859`		`-strncat(buf, type_name, nlen);`
`860`		`-strncat(buf, suffix, slen);`
	`860`	`+ buf += plen;`
	`861`	`+memcpy(buf, type_name, nlen);`
	`862`	`+ buf += nlen;`
	`863`	`+memcpy(buf, suffix, slen);`
`861`	`864`	`return buf;`
`862`	`865`	`}`
`863`	`866`

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!

Uh oh!

Commitd171d09

File tree

1 file changed

1 file changed

`‎numpy/_core/src/multiarray/stringdtype/casts.cpp`

0 commit comments