Commitd314616

Michael Meskes

committed

Fixed segfault due to freeing a struct definition twice if it was a named struct used in a typedef.

1 parentfe30edb commitd314616Copy full SHA for d314616

File tree

+11

-6

lines changed

+11

-6

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1895,3 +1895,8 @@ Mon Jan 10 13:55:32 CET 2005`
`1895`	`1895`	`- Set compat library version to 1.2.`
`1896`	`1896`	`- Set ecpg library version to 4.2.`
`1897`	`1897`
	`1898`	`+Tue Jan 25 13:47:45 CET 2005`
	`1899`	`+`
	`1900`	`+- Fixed segfault in preprocessor due to free a struct twice.`
	`1901`	`+- Set ecpg version to 3.2.1.`
	`1902`	`+`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# Copyright (c) 1998-2005, PostgreSQL Global Development Group`
`6`	`6`	`#`
`7`		`-# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.111 2005/01/18 05:00:28 momjian Exp $`
	`7`	`+# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.112 2005/01/25 12:51:31 meskes Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -14,8 +14,8 @@ top_builddir = ../../../..`
`14`	`14`	`include$(top_builddir)/src/Makefile.global`
`15`	`15`
`16`	`16`	`MAJOR_VERSION=3`
`17`		`-MINOR_VERSION=3`
`18`		`-PATCHLEVEL=0`
	`17`	`+MINOR_VERSION=2`
	`18`	`+PATCHLEVEL=1`
`19`	`19`
`20`	`20`	`overrideCPPFLAGS := -I$(srcdir)/../include -I$(srcdir)$(CPPFLAGS)\`
`21`	`21`	`-DMAJOR_VERSION=$(MAJOR_VERSION)\`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.303 2005/01/10 12:58:30 meskes Exp $*/`
	`1`	`+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.304 2005/01/25 12:51:31 meskes Exp $*/`
`2`	`2`
`3`	`3`	`/* Copyright comment*/`
`4`	`4`	`%{`
`@@ -4690,7 +4690,7 @@ type_declaration: S_TYPEDEF`
`4690`	`4690`	`this->type->type_index = length;/* length of string*/`
`4691`	`4691`	`this->type->type_sizeof = ECPGstruct_sizeof;`
`4692`	`4692`	`this->struct_member_list = ($3.type_enum == ECPGt_struct \|\|$3.type_enum == ECPGt_union) ?`
`4693`		`-struct_member_list[struct_level] :NULL;`
	`4693`	`+ECPGstruct_member_dup(struct_member_list[struct_level]) : NULL;`
`4694`	`4694`
`4695`	`4695`	`if ($3.type_enum != ECPGt_varchar &&`
`4696`	`4696`	`$3.type_enum != ECPGt_char &&`
`@@ -5556,7 +5556,7 @@ ECPGTypedef: TYPE_P`
`5556`	`5556`	`this->type->type_index = length;/* length of string*/`
`5557`	`5557`	`this->type->type_sizeof = ECPGstruct_sizeof;`
`5558`	`5558`	`this->struct_member_list = ($5.type_enum == ECPGt_struct \|\|$5.type_enum == ECPGt_union) ?`
`5559`		`-struct_member_list[struct_level] :NULL;`
	`5559`	`+ECPGstruct_member_dup(struct_member_list[struct_level]) : NULL;`
`5560`	`5560`
`5561`	`5561`	`if ($5.type_enum != ECPGt_varchar &&`
`5562`	`5562`	`$5.type_enum != ECPGt_char &&`

Comments

(0)