Commit8cf82ac

Michael Meskes

committed

Ecpglib stores variables that are used in DECLARE statements in a global list.

This list is now freed when the last connection has been closed.Closes: #6366

1 parentdfd26f9 commit8cf82acCopy full SHA for 8cf82ac

File tree

+17

-6

lines changed

+17

-6

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,13 @@ ecpg_finish(struct connection * act)`
`149`	`149`	`for (cache=act->cache_head;cache;ptr=cache,cache=cache->next,ecpg_free(ptr));`
`150`	`150`	`ecpg_free(act->name);`
`151`	`151`	`ecpg_free(act);`
	`152`	`+/* delete cursor variables when last connection gets closed */`
	`153`	`+if (all_connections==NULL)`
	`154`	`+{`
	`155`	`+structvar_list*iv_ptr;`
	`156`	`+`
	`157`	`+for (;ivlist;iv_ptr=ivlist,ivlist=ivlist->next,ecpg_free(iv_ptr));`
	`158`	`+}`
`152`	`159`	`}`
`153`	`160`	`else`
`154`	`161`	`ecpg_log("ecpg_finish: called an extra time\n");`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,15 @@ struct variable`
`121`	`121`	`structvariable*next;`
`122`	`122`	`};`
`123`	`123`
	`124`	`+structvar_list`
	`125`	`+{`
	`126`	`+intnumber;`
	`127`	`+void*pointer;`
	`128`	`+structvar_list*next;`
	`129`	`+};`
	`130`	`+`
	`131`	`+externstructvar_list*ivlist;`
	`132`	`+`
`124`	`133`	`/* Here are some methods used by the lib. */`
`125`	`134`
`126`	`135`	`/* Returns a pointer to a string containing a simple type name. */`

Lines changed: 1 addition & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -501,12 +501,7 @@ ecpg_gettext(const char *msgid)`
`501`	`501`	`}`
`502`	`502`	`#endif/* ENABLE_NLS */`
`503`	`503`
`504`		`-staticstructvar_list`
`505`		`-{`
`506`		`-intnumber;`
`507`		`-void*pointer;`
`508`		`-structvar_list*next;`
`509`		`-}*ivlist=NULL;`
	`504`	`+structvar_list*ivlist=NULL;`
`510`	`505`
`511`	`506`	`void`
`512`	`507`	`ECPGset_var(intnumber,void*pointer,intlineno)`

Comments

(0)