Commit1d45168

committed

Fix some misuses of strncat().

1 parent9ba4065 commit1d45168Copy full SHA for 1d45168

File tree

+14

-12

lines changed

+14

-12

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`*`
`18`	`18`	`* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group`
`19`	`19`	`*`
`20`		`- * $PostgreSQL: pgsql/src/bin/pg_config/pg_config.c,v 1.20 2006/06/06 22:41:09 momjian Exp $`
	`20`	`+ * $PostgreSQL: pgsql/src/bin/pg_config/pg_config.c,v 1.21 2006/09/27 16:19:42 tgl Exp $`
`21`	`21`	`*`
`22`	`22`	`*-------------------------------------------------------------------------`
`23`	`23`	`*/`
`@@ -213,7 +213,7 @@ show_pgxs(bool all)`
`213`	`213`	`if (all)`
`214`	`214`	`printf("PGXS = ");`
`215`	`215`	`get_pkglib_path(mypath,path);`
`216`		`-strncat(path,"/pgxs/src/makefiles/pgxs.mk",MAXPGPATH-1);`
	`216`	`+strncat(path,"/pgxs/src/makefiles/pgxs.mk",MAXPGPATH-1-strlen(path));`
`217`	`217`	`cleanup_path(path);`
`218`	`218`	`printf("%s\n",path);`
`219`	`219`	`}`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/tutorial/funcs.c,v 1.15 2006/05/31 20:58:09 tgl Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/tutorial/funcs.c,v 1.16 2006/09/27 16:19:42 tgl Exp $ */`
`2`	`2`
`3`	`3`	`/******************************************************************************`
`4`	`4`	`These are user-defined functions that can be bound to a Postgres backend`
`@@ -85,13 +85,14 @@ copytext(text *t)`
`85`	`85`	`text*`
`86`	`86`	`concat_text(textarg1,textarg2)`
`87`	`87`	`{`
`88`		`-int32new_text_size=VARSIZE(arg1)+VARSIZE(arg2)-VARHDRSZ;`
	`88`	`+int32arg1_size=VARSIZE(arg1)-VARHDRSZ;`
	`89`	`+int32arg2_size=VARSIZE(arg2)-VARHDRSZ;`
	`90`	`+int32new_text_size=arg1_size+arg2_size+VARHDRSZ;`
`89`	`91`	`textnew_text= (text)palloc(new_text_size);`
`90`	`92`
`91`		`-memset((void*)new_text,0,new_text_size);`
`92`	`93`	`VARATT_SIZEP(new_text)=new_text_size;`
`93`		`-strncpy(VARDATA(new_text),VARDATA(arg1),VARSIZE(arg1)-VARHDRSZ);`
`94`		`-strncat(VARDATA(new_text),VARDATA(arg2),VARSIZE(arg2)-VARHDRSZ);`
	`94`	`+memcpy(VARDATA(new_text),VARDATA(arg1),arg1_size);`
	`95`	`+memcpy(VARDATA(new_text)+arg1_size,VARDATA(arg2),arg2_size);`
`95`	`96`	`returnnew_text;`
`96`	`97`	`}`
`97`	`98`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/tutorial/funcs_new.c,v 1.11 2006/07/14 14:52:27 momjian Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/tutorial/funcs_new.c,v 1.12 2006/09/27 16:19:42 tgl Exp $ */`
`2`	`2`
`3`	`3`	`/******************************************************************************`
`4`	`4`	`These are user-defined functions that can be bound to a Postgres backend`
`@@ -101,13 +101,14 @@ concat_text(PG_FUNCTION_ARGS)`
`101`	`101`	`{`
`102`	`102`	`text*arg1=PG_GETARG_TEXT_P(0);`
`103`	`103`	`text*arg2=PG_GETARG_TEXT_P(1);`
`104`		`-int32new_text_size=VARSIZE(arg1)+VARSIZE(arg2)-VARHDRSZ;`
	`104`	`+int32arg1_size=VARSIZE(arg1)-VARHDRSZ;`
	`105`	`+int32arg2_size=VARSIZE(arg2)-VARHDRSZ;`
	`106`	`+int32new_text_size=arg1_size+arg2_size+VARHDRSZ;`
`105`	`107`	`textnew_text= (text)palloc(new_text_size);`
`106`	`108`
`107`		`-memset((void*)new_text,0,new_text_size);`
`108`	`109`	`VARATT_SIZEP(new_text)=new_text_size;`
`109`		`-strncpy(VARDATA(new_text),VARDATA(arg1),VARSIZE(arg1)-VARHDRSZ);`
`110`		`-strncat(VARDATA(new_text),VARDATA(arg2),VARSIZE(arg2)-VARHDRSZ);`
	`110`	`+memcpy(VARDATA(new_text),VARDATA(arg1),arg1_size);`
	`111`	`+memcpy(VARDATA(new_text)+arg1_size,VARDATA(arg2),arg2_size);`
`111`	`112`	`PG_RETURN_TEXT_P(new_text);`
`112`	`113`	`}`
`113`	`114`

Comments

(0)