Commit524d65d

Michael Meskes

committed

Fixed memory leak bugs found by Martijn Oosterhout.

1 parenta16ffee commit524d65dCopy full SHA for 524d65d

File tree

+16

-17

lines changed

+16

-17

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1997,6 +1997,10 @@ Tu Feb 7 18:48:14 CET 2006`
`1997`	`1997`	`Fri, 17 Mar 2006 16:38:19 +0100`
`1998`	`1998`
`1999`	`1999`	`- Fixed bug 2330: Wrong error code in case of a duplicate key`
	`2000`	`+`
	`2001`	`+Mo Apr 24 11:40:05 CEST 2006`
	`2002`	`+`
	`2003`	`+- Fixed memory leak bugs found by Martijn Oosterhout.`
`2000`	`2004`	`- Set ecpg library version to 5.2.`
`2001`	`2005`	`- Set ecpg version to 4.2.1.`
`2002`	`2006`

Lines changed: 5 additions & 5 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.41 2006/03/11 04:38:39 momjian Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/interfaces/ecpg/compatlib/informix.c,v 1.42 2006/04/24 09:45:22 meskes Exp $ */`
`2`	`2`
`3`	`3`	`#include<stdlib.h>`
`4`	`4`	`#include<string.h>`
`@@ -166,15 +166,15 @@ ecpg_strndup(const char *str, size_t len)`
`166`	`166`	`int`
`167`	`167`	`deccvasc(charcp,intlen,decimalnp)`
`168`	`168`	`{`
`169`		`-charstr=ecpg_strndup(cp,len);/ decimal_in always converts`
`170`		`- * the complete string */`
`171`		`-intret=0;`
`172`		`-numeric*result;`
	`169`	`+char*str;`
	`170`	`+intret=0;`
	`171`	`+numeric*result;`
`173`	`172`
`174`	`173`	`rsetnull(CDECIMALTYPE, (char*)np);`
`175`	`174`	`if (risnull(CSTRINGTYPE,cp))`
`176`	`175`	`return0;`
`177`	`176`
	`177`	`+str=ecpg_strndup(cp,len);/* decimal_in always converts the complete string */`
`178`	`178`	`if (!str)`
`179`	`179`	`ret=ECPG_INFORMIX_NUM_UNDERFLOW;`
`180`	`180`	`else`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.44 2005/11/30 12:49:49 meskes Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.45 2006/04/24 09:45:22 meskes Exp $ */`
`2`	`2`
`3`	`3`	`/*`
`4`	`4`	`* The aim is to get a simpler inteface to the database routines.`
`@@ -860,7 +860,7 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia`
`860`	`860`
`861`	`861`	`if (var->arrsize>1)`
`862`	`862`	`{`
`863`		`-for (element=0;element<var->arrsize;element++)`
	`863`	`+for (element=0;element<var->arrsize;element++,nval=PGTYPESnumeric_new())`
`864`	`864`	`{`
`865`	`865`	`if (var->type==ECPGt_numeric)`
`866`	`866`	`PGTYPESnumeric_copy((numeric) ((var+var->offsetelement)->value),nval);`

Lines changed: 5 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/numeric.c,v 1.25 2006/03/11 04:38:40 momjian Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/numeric.c,v 1.26 2006/04/24 09:45:22 meskes Exp $ */`
`2`	`2`
`3`	`3`	`#include"postgres_fe.h"`
`4`	`4`	`#include<ctype.h>`
`@@ -364,24 +364,19 @@ PGTYPESnumeric_from_asc(char str, char *endptr)`
`364`	`364`	`numericvalue= (numeric)pgtypes_alloc(sizeof(numeric));`
`365`	`365`	`intret;`
`366`	`366`
`367`		`-#if0`
`368`		`-longtypmod=-1;`
`369`		`-#endif`
`370`	`367`	`char*realptr;`
`371`	`368`	`char**ptr= (endptr!=NULL) ?endptr :&realptr;`
`372`	`369`
`373`		`-if (!value)`
	`370`	`+if (!value)`
`374`	`371`	`return (NULL);`
`375`	`372`
`376`	`373`	`ret=set_var_from_str(str,ptr,value);`
`377`	`374`	`if (ret)`
	`375`	`+{`
	`376`	`+free(value);`
`378`	`377`	`return (NULL);`
	`378`	`+}`
`379`	`379`
`380`		`-#if0`
`381`		`-ret=apply_typmod(value,typmod);`
`382`		`-if (ret)`
`383`		`-return (NULL);`
`384`		`-#endif`
`385`	`380`	`return (value);`
`386`	`381`	`}`
`387`	`382`

Comments

(0)