Commite6c7f7c

Michael Meskes

committed

Do not eat memory even in case of an out-of-memory error.

1 parentdf5a996 commite6c7f7cCopy full SHA for e6c7f7c

File tree

+12

-2

lines changed

+12

-2

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2386,6 +2386,10 @@ Fri, 10 Oct 2008 14:03:05 +0200`
`2386`	`2386`	`Tue, 14 Oct 2008 11:25:51 +0200`
`2387`	`2387`
`2388`	`2388`	`- Fixed parameter parsing.`
	`2389`	`+`
	`2390`	`+Sat, 25 Oct 2008 16:34:28 +0200`
	`2391`	`+`
	`2392`	`+- Free allocated memory even if the next alloc failed with ENOMEM.`
`2389`	`2393`	`- Set pgtypes library version to 3.1.`
`2390`	`2394`	`- Set compat library version to 3.1.`
`2391`	`2395`	`- Set ecpg library version to 6.2.`

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/interfaces/ecpg/compatlib/informix.c,v 1.55 2008/05/16 15:20:03 petere Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/interfaces/ecpg/compatlib/informix.c,v 1.56 2008/11/01 08:55:21 meskes Exp $ */`
`2`	`2`
`3`	`3`	`#definePOSTGRES_ECPG_INTERNAL`
`4`	`4`	`#include"postgres_fe.h"`
`@@ -755,10 +755,16 @@ rfmtlong(long lng_val, char fmt, char outbuf)`
`755`	`755`	`fmtchar=' ';`
`756`	`756`
`757`	`757`	`temp= (char*)malloc(fmt_len+1);`
	`758`	`+if (!temp)`
	`759`	`+{`
	`760`	`+errno=ENOMEM;`
	`761`	`+return-1;`
	`762`	`+}`
`758`	`763`
`759`	`764`	`/* put all info about the long in a struct */`
`760`		`-if (!temp\|\|initValue(lng_val)==-1)`
	`765`	`+if (initValue(lng_val)==-1)`
`761`	`766`	`{`
	`767`	`+free(temp);`
`762`	`768`	`errno=ENOMEM;`
`763`	`769`	`return-1;`
`764`	`770`	`}`

Comments

(0)