Commitd31ff14

committed

Fix memory overrun while setting ps status

1 parent18c3000 commitd31ff14Copy full SHA for d31ff14

File tree

+15

-9

lines changed

+15

-9

lines changed

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.38 1999/10/08 04:28:48 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.39 1999/12/10 10:29:01 ishii Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`* Globals used all over the place should be declared here and not`
`@@ -88,6 +88,13 @@ char *IndexedCatalogNames[] = {`
`88`	`88`	`};`
`89`	`89`
`90`	`90`
	`91`	`+/*`
	`92`	`+ * ps status buffer`
	`93`	`+ */`
	`94`	`+#ifndeflinux`
	`95`	`+charPs_status_buffer[1024];`
	`96`	`+#endif`
	`97`	`+`
`91`	`98`	`/* ----------------`
`92`	`99`	`* we just do a linear search now so there's no requirement that the list`
`93`	`100`	`* be ordered.The list is so small it shouldn't make much difference.`

Lines changed: 7 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,10 +48,9 @@ char *ps_status_buffer = NULL`
`48`	`48`
`49`	`49`	`#else/* !linux */`
`50`	`50`
`51`		`-externconstchar**ps_status;`
	`51`	`+externcharPs_status_buffer[];`
`52`	`52`
`53`		`-#definePS_DEFINE_BUFFER \`
`54`		`-const char **ps_status = NULL`
	`53`	`+#definePS_DEFINE_BUFFER`
`55`	`54`
`56`	`55`	`#definePS_INIT_STATUS(argc,argv,execname,username,hostname,dbname) \`
`57`	`56`	`{ \`
`@@ -61,18 +60,18 @@ const char **ps_status = NULL`
`61`	`60`	`argv[1] = hostname; \`
`62`	`61`	`argv[2] = username; \`
`63`	`62`	`argv[3] = dbname; \`
`64`		`-ps_status = (const char **)&argv[4]; \`
`65`		`-for (i =4; i < argc; i++) \`
	`63`	`+argv[4] = Ps_status_buffer; \`
	`64`	`+for (i =5; i < argc; i++) \`
`66`	`65`	`argv[i] = "";/* blank them */ \`
`67`	`66`	`}`
`68`	`67`
`69`	`68`	`#definePS_CLEAR_STATUS() \`
`70`		`-{if (ps_status) *ps_status = ""; }`
	`69`	`+{Ps_status_buffer[0] = '\0'; }`
`71`	`70`
`72`	`71`	`#definePS_SET_STATUS(status) \`
`73`		`-{if (ps_status) *ps_status =(status); }`
	`72`	`+{strcpy(Ps_status_buffer,(status)); }`
`74`	`73`
`75`		`-#definePS_STATUS (ps_status ? *ps_status : "")`
	`74`	`+#definePS_STATUS (Ps_status_buffer)`
`76`	`75`	`#endif`
`77`	`76`
`78`	`77`	`#ifdefNO_PS_STATUS`

Comments

(0)