NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit8c92485

committed

Avoid unnecessary use of strncpy in a couple of places in ecpg.

Use of strncpy with a length limit based on the source, rather thanthe destination, is non-idiomatic and draws warnings from gcc 8.Replace with memcpy, which does exactly the same thing in these cases,but with less chance for confusion.Backpatch to all supported branches.Discussion:https://postgr.es/m/21789.1529170195@sss.pgh.pa.us

1 parent1893326 commit8c92485Copy full SHA for 8c92485

File tree

2 files changed

-5

lines changed

src/interfaces/ecpg
- ecpglib
  - descriptor.c
- pgtypeslib
  - common.c

2 files changed

-5

lines changed

`‎src/interfaces/ecpg/ecpglib/descriptor.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ get_char_item(int lineno, void var, enum ECPGttype vartype, char value, int va`
`217`	`217`	`(structECPGgeneric_varchar*)var;`
`218`	`218`
`219`	`219`	`if (varcharsize==0)`
`220`		`-strncpy(variable->arr,value,strlen(value));`
	`220`	`+memcpy(variable->arr,value,strlen(value));`
`221`	`221`	`else`
`222`	`222`	`strncpy(variable->arr,value,varcharsize);`
`223`	`223`

`‎src/interfaces/ecpg/pgtypeslib/common.c‎`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,10 +42,8 @@ pgtypes_fmt_replace(union un_fmt_comb replace_val, int replace_type, char **outp`
`42`	`42`	`i=strlen(replace_val.str_val);`
`43`	`43`	`if (i+1 <=*pstr_len)`
`44`	`44`	`{`
`45`		`-/*`
`46`		`- * copy over i + 1 bytes, that includes the tailing terminator`
`47`		`- */`
`48`		`-strncpy(*output,replace_val.str_val,i+1);`
	`45`	`+/* include trailing terminator in what we copy */`
	`46`	`+memcpy(*output,replace_val.str_val,i+1);`
`49`	`47`	`*pstr_len-=i;`
`50`	`48`	`*output+=i;`
`51`	`49`	`if (replace_type==PGTYPES_TYPE_STRING_MALLOCED)`

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!

Commit8c92485

File tree

2 files changed

2 files changed

`‎src/interfaces/ecpg/ecpglib/descriptor.c‎`

`‎src/interfaces/ecpg/pgtypeslib/common.c‎`

0 commit comments