jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix seg fault in OSS

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@8686 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2006-02-03 00:00:39 +00:00
commit 66bee27235
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Source/CParse/parser.y
View file

@ -46,6 +46,7 @@ static Hash *extendhash = 0; /* Hash table of added methods */
static Hash *classes = 0; /* Hash table of classes */ static Hash *classes = 0; /* Hash table of classes */
static Symtab *prev_symtab = 0; static Symtab *prev_symtab = 0;
static Node *current_class = 0; static Node *current_class = 0;
static Node *class_decl = 0;
String *ModuleName = 0; String *ModuleName = 0;
static Node *module_node = 0; static Node *module_node = 0;
static String *Classprefix = 0; static String *Classprefix = 0;
@ -325,7 +326,7 @@ static void add_symbols(Node *n) {
Delete(prefix); Delete(prefix);
} }
if (!Getattr(n,k_parentnode)) set_parentNode(n,current_class); if (!Getattr(n,k_parentnode)) set_parentNode(n,current_class ? current_class : class_decl);
Setattr(n,"ismember","1"); Setattr(n,"ismember","1");
} }
} }
@ -3200,14 +3201,14 @@ cpp_class_decl :
} }
} }
inclass = 1; inclass = 1;
current_class = $$; current_class = class_decl = $$;
} cpp_members RBRACE cpp_opt_declarators { } cpp_members RBRACE cpp_opt_declarators {
Node *p; Node *p;
SwigType *ty; SwigType *ty;
Symtab *cscope = prev_symtab; Symtab *cscope = prev_symtab;
Node *am = 0; Node *am = 0;
String *scpname = 0; String *scpname = 0;
$$ = current_class; $$ = class_decl;
inclass = 0; inclass = 0;
current_class = 0; current_class = 0;
/* Check for pure-abstract class */ /* Check for pure-abstract class */
@ -3338,7 +3339,7 @@ cpp_class_decl :
Swig_symbol_newscope(); Swig_symbol_newscope();
cparse_start_line = cparse_line; cparse_start_line = cparse_line;
inclass = 1; inclass = 1;
current_class = $$; current_class = class_decl = $$;
Classprefix = NewStringEmpty(); Classprefix = NewStringEmpty();
Delete(Namespaceprefix); Delete(Namespaceprefix);
Namespaceprefix = Swig_symbol_qualifiedscopename(0); Namespaceprefix = Swig_symbol_qualifiedscopename(0);
@ -3346,7 +3347,7 @@ cpp_class_decl :
String *unnamed; String *unnamed;
Node *n; Node *n;
Classprefix = 0; Classprefix = 0;
$$ = current_class; $$ = class_decl;
inclass = 0; inclass = 0;
current_class = 0; current_class = 0;
unnamed = Getattr($$,k_unnamed); unnamed = Getattr($$,k_unnamed);