NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitedcaa8f

committed

Fix off-by-one memory allocation, as reported by Rod Taylor. Also

avoid repalloc'ing twice when once is sufficient.

1 parent6444bc3 commitedcaa8fCopy full SHA for edcaa8f

File tree

1 file changed

+17

-16

lines changed

src/backend/libpq
- hba.c

1 file changed

+17

-16

lines changed

`‎src/backend/libpq/hba.c`

Lines changed: 17 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.133 2004/10/12 21:54:38 petere Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.134 2004/11/17 19:54:24 tgl Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -218,6 +218,7 @@ next_token_expand(FILE *file)`
`218`	`218`	`char*comma_str=pstrdup("");`
`219`	`219`	`booltrailing_comma;`
`220`	`220`	`char*incbuf;`
	`221`	`+intneeded;`
`221`	`222`
`222`	`223`	`do`
`223`	`224`	`{`
`@@ -239,16 +240,14 @@ next_token_expand(FILE *file)`
`239`	`240`	`else`
`240`	`241`	`incbuf=pstrdup(buf);`
`241`	`242`
`242`		`-comma_str=repalloc(comma_str,`
`243`		`-strlen(comma_str)+strlen(incbuf)+1);`
	`243`	`+needed=strlen(comma_str)+strlen(incbuf)+1;`
	`244`	`+if (trailing_comma)`
	`245`	`+needed++;`
	`246`	`+comma_str=repalloc(comma_str,needed);`
`244`	`247`	`strcat(comma_str,incbuf);`
`245`		`-pfree(incbuf);`
`246`		`-`
`247`	`248`	`if (trailing_comma)`
`248`		`-{`
`249`		`-comma_str=repalloc(comma_str,strlen(comma_str)+1+1);`
`250`	`249`	`strcat(comma_str,MULTI_VALUE_SEP);`
`251`		`-}`
	`250`	`+pfree(incbuf);`
`252`	`251`	`}while (trailing_comma);`
`253`	`252`
`254`	`253`	`returncomma_str;`
`@@ -327,29 +326,31 @@ tokenize_inc_file(const char *inc_filename)`
`327`	`326`	`pfree(inc_fullname);`
`328`	`327`
`329`	`328`	`/* return empty string, it matches nothing */`
`330`		`-returnpstrdup("");`
	`329`	`+returncomma_str;`
`331`	`330`	`}`
`332`	`331`	`pfree(inc_fullname);`
`333`	`332`
`334`	`333`	`/* There is possible recursion here if the file contains @ */`
`335`	`334`	`tokenize_file(inc_file,&inc_lines,&inc_line_nums);`
`336`	`335`	`FreeFile(inc_file);`
`337`	`336`
`338`		`-/* Create comma-separate string from List */`
	`337`	`+/* Create comma-separated string from List */`
`339`	`338`	`foreach(line,inc_lines)`
`340`	`339`	`{`
`341`	`340`	`Listtoken_list= (List)lfirst(line);`
`342`	`341`	`ListCell*token;`
`343`	`342`
`344`	`343`	`foreach(token,token_list)`
`345`	`344`	`{`
`346`		`-if (strlen(comma_str))`
`347`		`-{`
`348`		`-comma_str=repalloc(comma_str,strlen(comma_str)+1);`
	`345`	`+intoldlen=strlen(comma_str);`
	`346`	`+intneeded;`
	`347`	`+`
	`348`	`+needed=oldlen+strlen(lfirst(token))+1;`
	`349`	`+if (oldlen>0)`
	`350`	`+needed++;`
	`351`	`+comma_str=repalloc(comma_str,needed);`
	`352`	`+if (oldlen>0)`
`349`	`353`	`strcat(comma_str,MULTI_VALUE_SEP);`
`350`		`-}`
`351`		`-comma_str=repalloc(comma_str,`
`352`		`-strlen(comma_str)+strlen(lfirst(token))+1);`
`353`	`354`	`strcat(comma_str,lfirst(token));`
`354`	`355`	`}`
`355`	`356`	`}`

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!

Commitedcaa8f

File tree

1 file changed

1 file changed

`‎src/backend/libpq/hba.c`

0 commit comments