NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit796a3f3

committed

protect vfprintf from hijacking by Windows gettext just like other members of the *printf family.

1 parentc15de02 commit796a3f3Copy full SHA for 796a3f3

File tree

2 files changed

+10

-3

lines changed

src
- include
  - port.h
- port
  - snprintf.c

2 files changed

+10

-3

lines changed

`‎src/include/port.h‎`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $PostgreSQL: pgsql/src/include/port.h,v 1.105 2006/10/19 20:56:22 tgl Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/include/port.h,v 1.106 2006/11/28 01:12:33 adunstan Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -145,6 +145,9 @@ extern unsigned char pg_tolower(unsigned char ch);`
`145`	`145`	`#ifdefsprintf`
`146`	`146`	`#undef sprintf`
`147`	`147`	`#endif`
	`148`	`+#ifdefvfprintf`
	`149`	`+#undef vfprintf`
	`150`	`+#endif`
`148`	`151`	`#ifdeffprintf`
`149`	`152`	`#undef fprintf`
`150`	`153`	`#endif`
`@@ -161,6 +164,7 @@ extern int`
`161`	`164`	`pg_sprintf(charstr,constcharfmt,...)`
`162`	`165`	`/* This extension allows gcc to check the format string */`
`163`	`166`	`__attribute__((format(printf,2,3)));`
	`167`	`+externintpg_vfprintf(FILEstream,constcharfmt,va_listargs);`
`164`	`168`	`externint`
`165`	`169`	`pg_fprintf(FILEstream,constcharfmt,...)`
`166`	`170`	`/* This extension allows gcc to check the format string */`
`@@ -179,12 +183,14 @@ __attribute__((format(printf, 1, 2)));`
`179`	`183`	`#definevsnprintf(...)pg_vsnprintf(__VA_ARGS__)`
`180`	`184`	`#definesnprintf(...)pg_snprintf(__VA_ARGS__)`
`181`	`185`	`#definesprintf(...)pg_sprintf(__VA_ARGS__)`
	`186`	`+#definevfprintf(...)pg_vfprintf(__VA_ARGS__)`
`182`	`187`	`#definefprintf(...)pg_fprintf(__VA_ARGS__)`
`183`	`188`	`#defineprintf(...)pg_printf(__VA_ARGS__)`
`184`	`189`	`#else`
`185`	`190`	`#definevsnprintfpg_vsnprintf`
`186`	`191`	`#definesnprintfpg_snprintf`
`187`	`192`	`#definesprintfpg_sprintf`
	`193`	`+#definevfprintfpg_vfprintf`
`188`	`194`	`#definefprintfpg_fprintf`
`189`	`195`	`#defineprintfpg_printf`
`190`	`196`	`#endif`

`‎src/port/snprintf.c‎`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF`
`32`	`32`	`* SUCH DAMAGE.`
`33`	`33`	`*`
`34`		`- * $PostgreSQL: pgsql/src/port/snprintf.c,v 1.32 2006/10/04 00:30:14 momjian Exp $`
	`34`	`+ * $PostgreSQL: pgsql/src/port/snprintf.c,v 1.33 2006/11/28 01:12:34 adunstan Exp $`
`35`	`35`	`*/`
`36`	`36`
`37`	`37`	`#include"c.h"`
`@@ -99,6 +99,7 @@`
`99`	`99`	`#undefvsnprintf`
`100`	`100`	`#undefsnprintf`
`101`	`101`	`#undefsprintf`
	`102`	`+#undefvfprintf`
`102`	`103`	`#undeffprintf`
`103`	`104`	`#undefprintf`
`104`	`105`
`@@ -209,7 +210,7 @@ pg_sprintf(char str, const char fmt,...)`
`209`	`210`	`returnlen;`
`210`	`211`	`}`
`211`	`212`
`212`		`-staticint`
	`213`	`+int`
`213`	`214`	`pg_vfprintf(FILEstream,constcharfmt,va_listargs)`
`214`	`215`	`{`
`215`	`216`	`PrintfTargettarget;`

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!

Commit796a3f3

File tree

2 files changed

2 files changed

`‎src/include/port.h‎`

`‎src/port/snprintf.c‎`

0 commit comments