catched symbol abuse

[fw/sdcc] / src / SDCC.lex

diff --git a/src/SDCC.lex b/src/SDCC.lex
index 723352b42b82d5710f9148dccb381c6ee48a5a95..edd1ee5dabcc6dd032800e0dc13ec2dfa17b730a 100644 (file)
--- a/src/SDCC.lex
+++ b/src/SDCC.lex
@@ -41,7 +41,6 @@ char *currFname;
 
 extern int lineno, column;
 extern char *filename ;
-extern char *fullSrcFileName ;
 int   yylineno = 1               ;
 void count()                     ;
 int process_pragma(char *);
@@ -94,8 +93,7 @@ struct options  save_options  ;
 <asm>"_endasm" { 
   count();
   *asmp = '\0';
-  yylval.yyinline = malloc (strlen(asmbuff)+1);
-  strcpy(yylval.yyinline,asmbuff);
+  yylval.yyinline = strdup (asmbuff);
   BEGIN(INITIAL);
   return (INLINEASM);
 }
@@ -286,7 +284,9 @@ int checkCurrFile ( char *s)
     /* get the currentfile name info    */
     s++ ;
 
-    if ( strncmp(s,fullSrcFileName,strlen(fullSrcFileName)) == 0) {
+    /* in c1mode fullSrcFileName is NULL */
+    if ( fullSrcFileName &&
+         strncmp(s,fullSrcFileName,strlen(fullSrcFileName)) == 0) {
       lineno = yylineno = lNum;                                        
       currFname = fullSrcFileName ;
     }  else {
@@ -294,8 +294,7 @@ int checkCurrFile ( char *s)
        /* mark the end of the filename */
        while (*s != '"') s++;
        *s = '\0';
-       currFname = malloc (strlen(sb)+1);
-       strcpy(currFname,sb);
+       currFname = strdup (sb);
        lineno = yylineno = lNum;
     }
     filename = currFname ;
@@ -326,11 +325,11 @@ int check_type()
 {
        /* check if it is in the typedef table */
        if (findSym(TypedefTab,NULL,yytext)) {
-               strcpy(yylval.yychar,yytext);
+               strncpyz(yylval.yychar,yytext, SDCC_NAME_MAX);
                return (TYPE_NAME) ;
        }
        else   {
-               strcpy (yylval.yychar,yytext);
+               strncpyz (yylval.yychar,yytext, SDCC_NAME_MAX);
                return(IDENTIFIER);
        }
 }
@@ -412,6 +411,13 @@ char *stringLiteral () {
   }  
   *str = '\0';
   
+  /* If we aren't going to fix it, at least trap it. */
+  if (strlen(strLitBuff) >= sizeof(strLitBuff))
+  {
+       fprintf(stderr, "Internal error: strLitBuff overflowed.\n");
+       exit(-1);
+  }
+  
   return strLitBuff;
 }