Initial diff by Rafael Sadowski. Patch to allow building with USE_SYSTRACE=Yes by lum@. Tested by Amit Kulkarni, Benjamin Nadland and Stefan Unterweger. Portswise OK sthen@
23 lines
800 B
Plaintext
23 lines
800 B
Plaintext
$OpenBSD: patch-src_main_connections_c,v 1.9 2012/07/04 12:38:06 dcoppa Exp $
|
|
--- src/main/connections.c.orig Mon Mar 5 00:05:03 2012
|
|
+++ src/main/connections.c Thu May 24 17:38:12 2012
|
|
@@ -2639,7 +2639,7 @@ static int text_vfprintf(Rconnection con, const char *
|
|
b = R_alloc(res + already + 1, sizeof(char));
|
|
strcpy(b, this->lastline);
|
|
p = b + already;
|
|
- vsprintf(p, format, ap);
|
|
+ vsnprintf(p, res + already + 1, format, ap);
|
|
} else if(res < 0) { /* just a failure indication */
|
|
#define NBUFSIZE (already + 100*BUFSIZE)
|
|
usedRalloc = TRUE;
|
|
@@ -4860,7 +4860,8 @@ static Rboolean gzcon_open(Rconnection con)
|
|
|
|
if(con->canread) {
|
|
/* read header */
|
|
- char c, ccc, method, flags, dummy[6];
|
|
+ signed char c;
|
|
+ char ccc, method, flags, dummy[6];
|
|
unsigned char head[2];
|
|
uInt len;
|
|
|