Changeset f487962 for src/Parser/lex.cc

Timestamp:

Aug 18, 2016, 10:37:38 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

8b7ee09

Parents:

9b967914

Message:

fix storage leaks in lexer

File:

• src/Parser/lex.cc (modified) (6 diffs)

src/Parser/lex.cc

@@ -1469 +1469 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Tue Aug 16 22:34:31 2016
- * Update Count     : 460
+ * Last Modified On : Thu Aug 18 22:17:30 2016
+ * Update Count     : 472
  */
 #line 20 "lex.ll"
@@ -1480 +1480 @@
 
 #include <string>
+#include <cstdio>                                                                               // FILENAME_MAX
 
 #include "lex.h"
@@ -1494 +1495 @@
 #define RETURN_STR(x)           yylval.tok.str = strtext; RETURN_LOCN( x )
 
-#define WHITE_RETURN(x)                                                                 // do nothing
+#define WHITE_RETURN(x)         // do nothing
 #define NEWLINE_RETURN()        WHITE_RETURN( '\n' )
 #define ASCIIOP_RETURN()        RETURN_CHAR( (int)yytext[0] ) // single character operator
-#define NAMEDOP_RETURN(x)       RETURN_VAL( x )                         // multichar operator, with a name
+#define NAMEDOP_RETURN(x)       RETURN_CHAR( x )                        // multichar operator, with a name
 #define NUMERIC_RETURN(x)       rm_underscore(); RETURN_VAL( x ) // numeric constant
 #define KEYWORD_RETURN(x)       RETURN_CHAR( x )                        // keyword
@@ -1531 +1532 @@
 
 
-#line 1534 "Parser/lex.cc"
+#line 1535 "Parser/lex.cc"
 
 #define INITIAL 0
@@ -1723 +1724 @@
         register int yy_act;
     
-#line 138 "lex.ll"
+#line 139 "lex.ll"
 
                                    /* line directives */
-#line 1729 "Parser/lex.cc"
+#line 1730 "Parser/lex.cc"
 
         if ( !(yy_init) )
@@ -1823 +1824 @@
 /* rule 1 can match eol */
 YY_RULE_SETUP
-#line 140 "lex.ll"
+#line 141 "lex.ll"
 {
         /* " stop highlighting */
+        static char *filename[FILENAME_MAX];                            // temporarily store current source-file name
         char *end_num;
         char *begin_string, *end_string;
-        char *filename;
         long lineno, length;
         lineno = strtol( yytext + 1, &end_num, 0 );
         begin_string = strchr( end_num, '"' );
-        if ( begin_string ) {
-                end_string = strchr( begin_string + 1, '"' );
-                if ( end_string ) {
-                        length = end_string - begin_string - 1;
-                        filename = new char[ length + 1 ];
-                        memcpy( filename, begin_string + 1, length );
-                        filename[ length ] = '\0';
-                        //std::cout << "file " << filename << " line " << lineno << std::endl;
-                        yylineno = lineno;
-                        yyfilename = filename;
-                } // if
+        if ( begin_string ) {                                                           // file name ?
+                end_string = strchr( begin_string + 1, '"' );   // look for ending delimiter
+                assert( end_string );                                                   // closing quote ?
+                length = end_string - begin_string - 1;                 // file-name length without quotes or sentinel
+                assert( length < FILENAME_MAX );                                // room for sentinel ?
+                memcpy( &filename, begin_string + 1, length );  // copy file name from yytext
+                filename[ length ] = '\0';                                              // terminate string with sentinel
+                //std::cout << "file " << filename << " line " << lineno << std::endl;
+                yylineno = lineno;
+                yyfilename = filename[0];
         } // if
 }