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

Fix seg fault with extra ) brackets and >>

Browse source
This commit is contained in:
William S Fulton 2014-04-07 20:53:36 +01:00
commit aa4b14a3d2
3 changed files with 38 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Examples/test-suite/errors/cpp_extra_brackets2.i Normal file
View file

@ -0,0 +1,9 @@
%module cpp_extra_brackets
// Extra brackets was segfaulting in SWIG-3.0.0
struct ABC {
;
)))
int operator<<(ABC &) { return 0; }
int operator>>(ABC &) { return 0; }
};

1
Examples/test-suite/errors/cpp_extra_brackets2.stderr Normal file
View file

@ -0,0 +1 @@
cpp_extra_brackets2.i:6: Error: Syntax error in input(3).

34
Source/Swig/scanner.c
View file

@ -271,10 +271,15 @@ static void freeze_line(Scanner *s, int val) {
* brackets_count()
*
* Returns the number of brackets at the current depth.
* A syntax error with unbalanced ) brackets will result in a NULL pointer return.
* ----------------------------------------------------------------------------- */
static int *brackets_count(Scanner *s) {
assert(Len(s->brackets) > 0);
return (int*)(**((void***)Getitem(s->brackets, 0))); /* TODO: Use VoidObj*->ptr instead of void** */
int *count;
if (Len(s->brackets) > 0)
count = (int *)Data(Getitem(s->brackets, 0));
else
count = 0;
return count;
}
/* -----------------------------------------------------------------------------
@ -295,7 +300,9 @@ static void brackets_clear(Scanner *s) {
* Usually called when '<' was found.
* ----------------------------------------------------------------------------- */
static void brackets_increment(Scanner *s) {
(*brackets_count(s))++;
int *count = brackets_count(s);
if (count)
(*count)++;
}
/* -----------------------------------------------------------------------------
@ -305,7 +312,9 @@ static void brackets_increment(Scanner *s) {
* Usually called when '>' was found.
* ----------------------------------------------------------------------------- */
static void brackets_decrement(Scanner *s) {
(*brackets_count(s))--;
int *count = brackets_count(s);
if (count)
(*count)--;
}
/* -----------------------------------------------------------------------------
@ -315,7 +324,9 @@ static void brackets_decrement(Scanner *s) {
* it is no longer possible to have a matching closing >> pair for a template.
* ----------------------------------------------------------------------------- */
static void brackets_reset(Scanner *s) {
(*brackets_count(s)) = 0;
int *count = brackets_count(s);
if (count)
*count = 0;
}
/* -----------------------------------------------------------------------------
@ -341,6 +352,17 @@ static void brackets_pop(Scanner *s) {
Delitem(s->brackets, 0);
}
/* -----------------------------------------------------------------------------
* brackets_allow_shift()
*
* Return 1 to allow shift (>>), or 0 if (>>) should be split into (> >).
* This is for C++11 template syntax for closing templates.
* ----------------------------------------------------------------------------- */
static int brackets_allow_shift(Scanner *s) {
int *count = brackets_count(s);
return !count || (*count < 0);
}
/* -----------------------------------------------------------------------------
* retract()
*
@ -871,7 +893,7 @@ static int look(Scanner *s) {
brackets_decrement(s);
if ((c = nextchar(s)) == 0)
return SWIG_TOKEN_GREATERTHAN;
if (c == '>' && ((*brackets_count(s))<0)) /* go to double >> only, if no template < has been used */
if (c == '>' && brackets_allow_shift(s))
state = 250;
else if (c == '=')
return SWIG_TOKEN_GTEQUAL;