Propagate ecpg core dump fix into 8.0 branch.

diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
index 1f8252731b6d2d3924459241c0261520323e690b..3e04df895cce3d913d71ef5b083ad1a17cc2eb9a 100644 (file)
--- a/src/interfaces/ecpg/ChangeLog
+++ b/src/interfaces/ecpg/ChangeLog
@@ -1895,3 +1895,8 @@ Mon Jan 10 13:55:32 CET 2005
        - Set compat library version to 1.2.
        - Set ecpg library version to 4.2.
 
+Tue Jan 25 13:47:45 CET 2005
+
+       - Fixed segfault in preprocessor due to free a struct twice.
+       - Set ecpg version to 3.2.1.
+

diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile
index 44ee6286d403e9b3a676100ddd3ceef67c352335..aa3e90c69db5c7ef22a720689840b7ab36c591cf 100644 (file)
--- a/src/interfaces/ecpg/preproc/Makefile
+++ b/src/interfaces/ecpg/preproc/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1998-2005, PostgreSQL Global Development Group
 #
-# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.110 2005/01/01 20:44:31 tgl Exp $
+# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.110.4.1 2005/01/26 22:52:01 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -15,7 +15,7 @@ include $(top_builddir)/src/Makefile.global
 
 MAJOR_VERSION=3
 MINOR_VERSION=2
-PATCHLEVEL=0
+PATCHLEVEL=1
 
 override CPPFLAGS := -I$(srcdir)/../include -I$(srcdir) $(CPPFLAGS) \
        -DMAJOR_VERSION=$(MAJOR_VERSION) \

diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
index 8ee348fc2f72c3b26773f3033cbfbecbb9459d84..7ae91a76b7aa04013ac407cd8eecfdf0e75241da 100644 (file)
--- a/src/interfaces/ecpg/preproc/preproc.y
+++ b/src/interfaces/ecpg/preproc/preproc.y
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.303 2005/01/10 12:58:30 meskes Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.303.4.1 2005/01/26 22:52:01 tgl Exp $ */
 
 /* Copyright comment */
 %{
@@ -4690,7 +4690,7 @@ type_declaration: S_TYPEDEF
                        this->type->type_index = length;    /* length of string */
                        this->type->type_sizeof = ECPGstruct_sizeof;
                        this->struct_member_list = ($3.type_enum == ECPGt_struct || $3.type_enum == ECPGt_union) ?
-                               struct_member_list[struct_level] : NULL;
+                               ECPGstruct_member_dup(struct_member_list[struct_level]) : NULL;
 
                        if ($3.type_enum != ECPGt_varchar &&
                            $3.type_enum != ECPGt_char &&
@@ -5556,7 +5556,7 @@ ECPGTypedef: TYPE_P
                                this->type->type_index = length;        /* length of string */
                                this->type->type_sizeof = ECPGstruct_sizeof;
                                this->struct_member_list = ($5.type_enum == ECPGt_struct || $5.type_enum == ECPGt_union) ?
-                                       struct_member_list[struct_level] : NULL;
+                                       ECPGstruct_member_dup(struct_member_list[struct_level]) : NULL;
 
                                if ($5.type_enum != ECPGt_varchar &&
                                        $5.type_enum != ECPGt_char &&