Skip to content

Commit 45eebaf

Browse files
author
Michael Meskes
committed
Fixed segfault in forward definition parsing.
1 parent 21b8e0a commit 45eebaf

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/interfaces/ecpg/ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1469,6 +1469,10 @@ Fri May 30 15:19:39 CEST 2003
14691469

14701470
- Implemented prototype describe function.
14711471
- Some minor cleanup/bug fixing.
1472+
1473+
Mon Jun 2 17:36:03 CEST 2003
1474+
1475+
- Fixed segfault in forward definition parsing.
14721476
- Set ecpg version to 2.12.0.
14731477
- Set ecpg library to 3.4.2.
14741478
- Set pgtypes library to 1.0.0

src/interfaces/ecpg/preproc/preproc.y

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/preproc.y,v 1.227 2003/05/30 13:22:02 meskes Exp $ */
1+
/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/preproc.y,v 1.228 2003/06/02 15:38:02 meskes Exp $ */
22

33
/* Copyright comment */
44
%{
@@ -4437,7 +4437,7 @@ single_vt_type: common_type
44374437
/* this is for named structs/unions */
44384438
char *name;
44394439
struct typedefs *this;
4440-
bool forward = (strcmp($1.symbol, forward_name) == 0 && strcmp($1.su, "struct") == 0);
4440+
bool forward = (forward_name != NULL && strcmp($1.symbol, forward_name) == 0 && strcmp($1.su, "struct") == 0);
44414441

44424442
name = cat2_str($1.su, $1.symbol);
44434443
/* Do we have a forward definition? */
@@ -4791,7 +4791,7 @@ var_type: common_type
47914791
/* this is for named structs/unions */
47924792
char *name;
47934793
struct typedefs *this;
4794-
bool forward = (strcmp($1.symbol, forward_name) == 0 && strcmp($1.su, "struct") == 0);
4794+
bool forward = (forward_name != NULL && strcmp($1.symbol, forward_name) == 0 && strcmp($1.su, "struct") == 0);
47954795

47964796
name = cat2_str($1.su, $1.symbol);
47974797
/* Do we have a forward definition? */

0 commit comments

Comments
 (0)