The R Project SVN – R – Diff – /trunk/src/main/gram.y

     R_ParseErrorCol  = yylloc.first_column;
     R_ParseErrorFile = PS_SRCFILE;
     if (!strncmp(s, yyunexpected, sizeof yyunexpected -1)) {
 	int i;
-	/* Edit the error message */
+	/* Edit the error message: needs a copy */
+	char s1[PARSE_ERROR_SIZE + 1];
+	strncpy(s1, s, PARSE_ERROR_SIZE);
+	s1[PARSE_ERROR_SIZE] = 0;
-	expecting = (char *) strstr(s + sizeof yyunexpected -1, yyexpecting);
+	expecting = strstr(s1 + sizeof yyunexpected -1, yyexpecting);
 	if (expecting) *expecting = '\0';
 	for (i = 0; yytname_translations[i]; i += 2) {
-	    if (!strcmp(s + sizeof yyunexpected - 1, yytname_translations[i])) {
+	    if (!strcmp(s1 + sizeof yyunexpected - 1, yytname_translations[i])) {
                 switch(i/2)
+                {
                 case 0:
                         snprintf(R_ParseErrorMsg, PARSE_ERROR_SIZE, _("unexpected input"));
                                 break;
                                 break;
                 case 7:
                         snprintf(R_ParseErrorMsg, PARSE_ERROR_SIZE, _("unexpected end of line"));
                                 break;
                 default:
-		  if (!strcmp(s + sizeof yyunexpected - 1, "PLACEHOLDER")) {
+		  if (!strcmp(s1 + sizeof yyunexpected - 1, "PLACEHOLDER")) {
 		      /* cheat to avoid changing the parse error
 			 message for mis-use of _ */
 		      snprintf(R_ParseErrorMsg, PARSE_ERROR_SIZE,
 			       _("unexpected input"));
 		      break;
 		return;
+	    }
+	}
 	snprintf(R_ParseErrorMsg, PARSE_ERROR_SIZE - 1, _("unexpected %s"),
-                 s + sizeof yyunexpected - 1);
+                 s1 + sizeof yyunexpected - 1);
     } else {
 	strncpy(R_ParseErrorMsg, s, PARSE_ERROR_SIZE - 1);
         R_ParseErrorMsg[PARSE_ERROR_SIZE - 1] = '\0';
+    }
+}

The R Project SVN R

(root)/trunk/src/main/gram.y – Rev 90254 → 90289