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

Fix seg fault for some template parameters which have no type, just a default value

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11720 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2009-11-03 19:52:12 +00:00
commit 57fff12d5f
2 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Source/CParse/parser.y
View file

@ -2644,6 +2644,7 @@ template_directive: SWIGTEMPLATE LPAREN idstringopt RPAREN idcolonnt LESSTHAN va
n = Swig_cparse_template_locate($5,$7,tscope); n = Swig_cparse_template_locate($5,$7,tscope);
/* Patch the argument types to respect namespaces */ /* Patch the argument types to respect namespaces */
Printf(stdout, " p before patching: %s\n", ParmList_str_defaultargs($7));
p = $7; p = $7;
while (p) { while (p) {
SwigType *value = Getattr(p,"value"); SwigType *value = Getattr(p,"value");
@ -2669,6 +2670,7 @@ template_directive: SWIGTEMPLATE LPAREN idstringopt RPAREN idcolonnt LESSTHAN va
p = nextSibling(p); p = nextSibling(p);
} }
Printf(stdout, " p after patching: %s\n", ParmList_str_defaultargs($7));
/* Look for the template */ /* Look for the template */
{ {
@ -2746,6 +2748,7 @@ template_directive: SWIGTEMPLATE LPAREN idstringopt RPAREN idcolonnt LESSTHAN va
def_supplied = 1; def_supplied = 1;
} }
} }
Printf(stdout, " p tempar patching: %s\n", ParmList_str_defaultargs(temparms));
templnode = copy_node(nn); templnode = copy_node(nn);
/* We need to set the node name based on name used to instantiate */ /* We need to set the node name based on name used to instantiate */

17
Source/Swig/parms.c
View file

@ -114,6 +114,14 @@ int ParmList_len(ParmList *p) {
return i; return i;
} }
/* ---------------------------------------------------------------------
* get_empty_type()
* ---------------------------------------------------------------------- */
static SwigType *get_empty_type() {
return NewStringEmpty();
}
/* --------------------------------------------------------------------- /* ---------------------------------------------------------------------
* ParmList_str() * ParmList_str()
* *
@ -123,7 +131,8 @@ int ParmList_len(ParmList *p) {
String *ParmList_str(ParmList *p) { String *ParmList_str(ParmList *p) {
String *out = NewStringEmpty(); String *out = NewStringEmpty();
while (p) { while (p) {
String *pstr = SwigType_str(Getattr(p, "type"), Getattr(p, "name")); String *type = Getattr(p, "type");
String *pstr = SwigType_str(type ? type : get_empty_type(), Getattr(p, "name"));
Append(out, pstr); Append(out, pstr);
p = nextSibling(p); p = nextSibling(p);
if (p) { if (p) {
@ -144,7 +153,8 @@ String *ParmList_str_defaultargs(ParmList *p) {
String *out = NewStringEmpty(); String *out = NewStringEmpty();
while (p) { while (p) {
String *value = Getattr(p, "value"); String *value = Getattr(p, "value");
String *pstr = SwigType_str(Getattr(p, "type"), Getattr(p, "name")); String *type = Getattr(p, "type");
String *pstr = SwigType_str(type ? type : get_empty_type(), Getattr(p, "name"));
Append(out, pstr); Append(out, pstr);
if (value) { if (value) {
Printf(out, "=%s", value); Printf(out, "=%s", value);
@ -167,7 +177,8 @@ String *ParmList_str_defaultargs(ParmList *p) {
String *ParmList_protostr(ParmList *p) { String *ParmList_protostr(ParmList *p) {
String *out = NewStringEmpty(); String *out = NewStringEmpty();
while (p) { while (p) {
String *pstr = SwigType_str(Getattr(p, "type"), 0); String *type = Getattr(p, "type");
String *pstr = SwigType_str(type ? type : get_empty_type(), 0);
Append(out, pstr); Append(out, pstr);
p = nextSibling(p); p = nextSibling(p);
if (p) { if (p) {