Commit82c117c

committed

Fix pnstrdup() to not memcpy() the maximum allowed length.

The previous behaviour was dangerous if the length passed wasn't thesize of the underlying buffer, but the maximum size of the underlyingbuffer.Author: Andres FreundDiscussion:https://postgr.es/m/20161003215524.mwz5p45pcverrkyk@alap3.anarazel.de

1 parent8a24179 commit82c117cCopy full SHA for 82c117c

File tree

-1

lines changed

-1

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`
`22`	`22`	`#include"postgres.h"`
`23`	`23`
	`24`	`+#include"common/string.h"`
`24`	`25`	`#include"miscadmin.h"`
`25`	`26`	`#include"utils/memdebug.h"`
`26`	`27`	`#include"utils/memutils.h"`
`@@ -1086,10 +1087,14 @@ pstrdup(const char *in)`
`1086`	`1087`	`char*`
`1087`	`1088`	`pnstrdup(constchar*in,Sizelen)`
`1088`	`1089`	`{`
`1089`		`-char*out=palloc(len+1);`
	`1090`	`+char*out;`
`1090`	`1091`
	`1092`	`+len=pg_strnlen(in,len);`
	`1093`	`+`
	`1094`	`+out=palloc(len+1);`
`1091`	`1095`	`memcpy(out,in,len);`
`1092`	`1096`	`out[len]='\0';`
	`1097`	`+`
`1093`	`1098`	`returnout;`
`1094`	`1099`	`}`
`1095`	`1100`

Comments

(0)