The R Project SVN – R – Diff – /trunk/src/main/errors.c

 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 1995--2012  The R Core Team.
+ *  Copyright (C) 1995--2013  The R Core Team.
+ *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
 	len = strlen(head) + strlen(mid) + strlen(tail);
 	Rvsnprintf(tmp, min(BUFSIZE, R_WarnLength) - strlen(head), format, ap);
 	dcall = CHAR(STRING_ELT(deparse1s(call), 0));
 	if (len + strlen(dcall) + strlen(tmp) < BUFSIZE) {
-	    sprintf(errbuf, "%s%s%s", head, dcall, mid);
+	    snprintf(errbuf, BUFSIZE,  "%s%s%s", head, dcall, mid);
 	    if (mbcslocale) {
 		int msgline1;
 		char *p = strchr(tmp, '\n');
 		if (p) {
 		    *p = '\0';
 		if (14 + strlen(dcall) + msgline1 > LONGWARN)
 		    strcat(errbuf, tail);
+	    }
 	    strcat(errbuf, tmp);
 	} else {
-	    sprintf(errbuf, _("Error: "));
+	    snprintf(errbuf, BUFSIZE, _("Error: "));
-	    strcat(errbuf, tmp);
+	    strcat(errbuf, tmp); // FIXME
+	}
 	UNPROTECT(protected);
+    }
     else {
-	sprintf(errbuf, _("Error: "));
+	snprintf(errbuf, BUFSIZE, _("Error: "));
 	p = errbuf + strlen(errbuf);
 	Rvsnprintf(p, min(BUFSIZE, R_WarnLength) - strlen(errbuf), format, ap);
+    }
     p = errbuf + strlen(errbuf) - 1;
 		break;
+	    }
 	    rho = CDR(rho);
+	}
 	if(strlen(domain)) {
-	    R_CheckStack2(strlen(domain)+3);
+	    size_t len = strlen(domain)+3;
+	    R_CheckStack2(len);
-	    buf = (char *) alloca(strlen(domain)+3);
+	    buf = (char *) alloca(len);
-	    sprintf(buf, "R-%s", domain);
+	    snprintf(buf, len, "R-%s", domain);
 	    domain = buf;
+	}
     } else if(isString(CAR(args)))
 	domain = translateChar(STRING_ELT(CAR(args),0));
     else if(isLogical(CAR(args)) && LENGTH(CAR(args)) == 1 && LOGICAL(CAR(args))[0] == NA_LOGICAL) ;
 		break;
+	    }
 	    rho = CDR(rho);
+	}
 	if(strlen(domain)) {
-	    R_CheckStack2(strlen(domain)+3);
+	    size_t len = strlen(domain)+3;
+	    R_CheckStack2(len);
-	    buf = (char *) alloca(strlen(domain)+3);
+	    buf = (char *) alloca(len);
-	    sprintf(buf, "R-%s", domain);
+	    snprintf(buf, len, "R-%s", domain);
 	    domain = buf;
+	}
     } else if(isString(sdom))
 	domain = CHAR(STRING_ELT(sdom,0));
     else if(isLogical(sdom) && LENGTH(sdom) == 1 && LOGICAL(sdom)[0] == NA_LOGICAL) ;

The R Project SVN R

(root)/trunk/src/main/errors.c @ 63243 – Rev 62372 → 62580