← Back to branch summary

~ubuntu-branches/ubuntu/precise/graphviz/precise-security

« back to all changes in this revision

Viewing changes to lib/expr/extoken.c

  • Committer: Bazaar Package Importer
  • Author(s): David Claughton
  • Date: 2010-03-24 22:45:18 UTC
  • mfrom: (1.2.7 upstream) (6.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100324224518-do441tthbqjaqjzd
Tags: 2.26.3-4
http://bugs.debian.org/575255
Add patch to fix segfault in circo. Backported from upstream snapshot
release.  Thanks to Francis Russell for his work on this.
(Closes: #575255)

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/expr/extoken.c
1
 
/* $Id: extoken.c,v 1.1.1.1 2004/12/23 04:05:07 ellson Exp $ $Revision: 1.1.1.1 $ */
 
1
/* $Id: extoken.c,v 1.8 2009/10/19 18:30:21 erg Exp $ $Revision: 1.8 $ */
2
2
/* vim:set shiftwidth=4 ts=8: */
3
3
 
4
4
/**********************************************************
71
71
        s = " DEC ";
72
72
        t = "--";
73
73
        break;
 
74
    case FUNCTION:
 
75
        s = " FUNCTION ";
 
76
        t = exlval.id->name;
 
77
        break;
74
78
    case DECLARE:
75
79
        s = " DECLARE ";
76
80
        t = exlval.id->name;
170
174
    case FOR:
171
175
        s = " for";
172
176
        break;
 
177
    case ITERATER:
 
178
        s = " forr";
 
179
        break;
173
180
    case GSUB:
174
181
        s = " gsub";
175
182
        break;
176
183
    case IF:
177
184
        s = " if";
178
185
        break;
 
186
    case IN_OP:
 
187
        s = " in";
 
188
        break;
179
189
    case PRAGMA:
180
190
        s = " pragma";
181
191
        break;
194
204
    case RETURN:
195
205
        s = " return";
196
206
        break;
 
207
    case SPLIT:
 
208
        s = " split";
 
209
        break;
197
210
    case SPRINTF:
198
211
        s = " sprintf";
199
212
        break;
209
222
    case SWITCH:
210
223
        s = " switch";
211
224
        break;
 
225
    case TOKENS:
 
226
        s = " tokens";
 
227
        break;
 
228
    case UNSET:
 
229
        s = " unset";
 
230
        break;
212
231
    case WHILE:
213
232
        s = " while";
214
233
        break;
637
656
 
638
657
                switch (exlval.id->lex) {
639
658
                case DECLARE:
640
 
                    if (exlval.id->index == CHAR) {
 
659
                    if (exlval.id->index == CHARACTER) {
641
660
                        /*
642
661
                         * `char*' === `string'
643
662
                         * the * must immediately follow char